aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/fcoe/Makefile2
-rw-r--r--drivers/scsi/fcoe/fcoe_ctlr.c8
-rw-r--r--drivers/scsi/fcoe/fcoe_transport.c8
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/scsi/fcoe/Makefile b/drivers/scsi/fcoe/Makefile
index b122b7abddc6..f6d37d0271f7 100644
--- a/drivers/scsi/fcoe/Makefile
+++ b/drivers/scsi/fcoe/Makefile
@@ -1,4 +1,4 @@
1obj-$(CONFIG_FCOE) += fcoe.o 1obj-$(CONFIG_FCOE) += fcoe.o
2obj-$(CONFIG_LIBFCOE) += libfcoe.o 2obj-$(CONFIG_LIBFCOE) += libfcoe.o
3 3
4libfcoe-objs := fcoe_ctlr.o 4libfcoe-objs := fcoe_ctlr.o fcoe_transport.o
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
index c12d0a7e0d3d..c93f007e702f 100644
--- a/drivers/scsi/fcoe/fcoe_ctlr.c
+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
@@ -46,10 +46,6 @@
46 46
47#include "libfcoe.h" 47#include "libfcoe.h"
48 48
49MODULE_AUTHOR("Open-FCoE.org");
50MODULE_DESCRIPTION("FIP discovery protocol support for FCoE HBAs");
51MODULE_LICENSE("GPL v2");
52
53#define FCOE_CTLR_MIN_FKA 500 /* min keep alive (mS) */ 49#define FCOE_CTLR_MIN_FKA 500 /* min keep alive (mS) */
54#define FCOE_CTLR_DEF_FKA FIP_DEF_FKA /* default keep alive (mS) */ 50#define FCOE_CTLR_DEF_FKA FIP_DEF_FKA /* default keep alive (mS) */
55 51
@@ -68,10 +64,6 @@ static u8 fcoe_all_enode[ETH_ALEN] = FIP_ALL_ENODE_MACS;
68static u8 fcoe_all_vn2vn[ETH_ALEN] = FIP_ALL_VN2VN_MACS; 64static u8 fcoe_all_vn2vn[ETH_ALEN] = FIP_ALL_VN2VN_MACS;
69static u8 fcoe_all_p2p[ETH_ALEN] = FIP_ALL_P2P_MACS; 65static u8 fcoe_all_p2p[ETH_ALEN] = FIP_ALL_P2P_MACS;
70 66
71unsigned int libfcoe_debug_logging;
72module_param_named(debug_logging, libfcoe_debug_logging, int, S_IRUGO|S_IWUSR);
73MODULE_PARM_DESC(debug_logging, "a bit mask of logging levels");
74
75static const char * const fcoe_ctlr_states[] = { 67static const char * const fcoe_ctlr_states[] = {
76 [FIP_ST_DISABLED] = "DISABLED", 68 [FIP_ST_DISABLED] = "DISABLED",
77 [FIP_ST_LINK_WAIT] = "LINK_WAIT", 69 [FIP_ST_LINK_WAIT] = "LINK_WAIT",
diff --git a/drivers/scsi/fcoe/fcoe_transport.c b/drivers/scsi/fcoe/fcoe_transport.c
index 41d69bedd4b4..e5aef5639124 100644
--- a/drivers/scsi/fcoe/fcoe_transport.c
+++ b/drivers/scsi/fcoe/fcoe_transport.c
@@ -27,6 +27,10 @@
27 27
28#include "libfcoe.h" 28#include "libfcoe.h"
29 29
30MODULE_AUTHOR("Open-FCoE.org");
31MODULE_DESCRIPTION("FIP discovery protocol and FCoE transport for FCoE HBAs");
32MODULE_LICENSE("GPL v2");
33
30static int fcoe_transport_create(const char *, struct kernel_param *); 34static int fcoe_transport_create(const char *, struct kernel_param *);
31static int fcoe_transport_destroy(const char *, struct kernel_param *); 35static int fcoe_transport_destroy(const char *, struct kernel_param *);
32static int fcoe_transport_show(char *buffer, const struct kernel_param *kp); 36static int fcoe_transport_show(char *buffer, const struct kernel_param *kp);
@@ -39,6 +43,10 @@ static LIST_HEAD(fcoe_transports);
39static LIST_HEAD(fcoe_netdevs); 43static LIST_HEAD(fcoe_netdevs);
40static DEFINE_MUTEX(ft_mutex); 44static DEFINE_MUTEX(ft_mutex);
41 45
46unsigned int libfcoe_debug_logging;
47module_param_named(debug_logging, libfcoe_debug_logging, int, S_IRUGO|S_IWUSR);
48MODULE_PARM_DESC(debug_logging, "a bit mask of logging levels");
49
42module_param_call(show, NULL, fcoe_transport_show, NULL, S_IRUSR); 50module_param_call(show, NULL, fcoe_transport_show, NULL, S_IRUSR);
43__MODULE_PARM_TYPE(show, "string"); 51__MODULE_PARM_TYPE(show, "string");
44MODULE_PARM_DESC(show, " Show attached FCoE transports"); 52MODULE_PARM_DESC(show, " Show attached FCoE transports");