Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e01efc33 authored by Yi Zou's avatar Yi Zou Committed by James Bottomley
Browse files

[SCSI] libfcoe: include fcoe_transport.c into kernel libfcoe module 



Now we can include the fcoe_transport.c to the build of the kernel libfcoe
module. Move the module information to fcoe_transport, and it will have
all the module parameters later for the create/destroy/enable/disable of an
FCoE instance.

Signed-off-by: default avatarYi Zou <yi.zou@intel.com>
Signed-off-by: default avatarBhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 0095a921

drivers/scsi/fcoe/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_FCOE) += fcoe.o

obj-$(CONFIG_LIBFCOE) += libfcoe.o



libfcoe-objs := fcoe_ctlr.o
 
libfcoe-objs := fcoe_ctlr.o fcoe_transport.o

drivers/scsi/fcoe/fcoe_ctlr.c

+0 −8
Original line number Diff line number Diff line
@@ -46,10 +46,6 @@ 


#include "libfcoe.h"



MODULE_AUTHOR("Open-FCoE.org");

MODULE_DESCRIPTION("FIP discovery protocol support for FCoE HBAs");

MODULE_LICENSE("GPL v2");



#define	FCOE_CTLR_MIN_FKA	500		/* min keep alive (mS) */

#define	FCOE_CTLR_DEF_FKA	FIP_DEF_FKA	/* default keep alive (mS) */
@@ -68,10 +64,6 @@ static u8 fcoe_all_enode[ETH_ALEN] = FIP_ALL_ENODE_MACS; 
static u8 fcoe_all_vn2vn[ETH_ALEN] = FIP_ALL_VN2VN_MACS;

static u8 fcoe_all_p2p[ETH_ALEN] = FIP_ALL_P2P_MACS;



unsigned int libfcoe_debug_logging;

module_param_named(debug_logging, libfcoe_debug_logging, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(debug_logging, "a bit mask of logging levels");



static const char * const fcoe_ctlr_states[] = {

	[FIP_ST_DISABLED] =	"DISABLED",

	[FIP_ST_LINK_WAIT] =	"LINK_WAIT",

drivers/scsi/fcoe/fcoe_transport.c

+8 −0
Original line number Diff line number Diff line
@@ -27,6 +27,10 @@ 


#include "libfcoe.h"



MODULE_AUTHOR("Open-FCoE.org");

MODULE_DESCRIPTION("FIP discovery protocol and FCoE transport for FCoE HBAs");

MODULE_LICENSE("GPL v2");



static int fcoe_transport_create(const char *, struct kernel_param *);

static int fcoe_transport_destroy(const char *, struct kernel_param *);

static int fcoe_transport_show(char *buffer, const struct kernel_param *kp);
@@ -39,6 +43,10 @@ static LIST_HEAD(fcoe_transports); 
static LIST_HEAD(fcoe_netdevs);

static DEFINE_MUTEX(ft_mutex);



unsigned int libfcoe_debug_logging;

module_param_named(debug_logging, libfcoe_debug_logging, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(debug_logging, "a bit mask of logging levels");



module_param_call(show, NULL, fcoe_transport_show, NULL, S_IRUSR);

__MODULE_PARM_TYPE(show, "string");

MODULE_PARM_DESC(show, " Show attached FCoE transports");