iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libfc, fcoe, bnx2fc: Split fc_disc_init into fc_disc_{init, config}

Browse Source 
Split discovery initialization in code that is setup once (fcoe_disc_init)
and code that can be re-configured (fcoe_disc_config).

Signed-off-by: Robert Love <robert.w.love@intel.com>
Tested-by: Jack Morgan <jack.morgan@intel.com>
Reviewed-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
This commit is contained in:
Robert Love 2013-03-25 11:00:28 -07:00
parent 8a9a713812
commit 0807619d3c
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
View File

@ -939,7 +939,8 @@ static int bnx2fc_libfc_config(struct fc_lport *lport)
fc_elsct_init(lport); fc_elsct_init(lport);
fc_exch_init(lport); fc_exch_init(lport);
fc_rport_init(lport); fc_rport_init(lport);
fc_disc_init(lport, lport); fc_disc_init(lport);
fc_disc_config(lport, lport);
return 0; return 0;
} }

3
drivers/scsi/fcoe/fcoe_ctlr.c
View File

@ -2847,7 +2847,8 @@ int fcoe_libfc_config(struct fc_lport *lport, struct fcoe_ctlr *fip,
priv = fip; priv = fip;
} }
fc_disc_init(lport, priv); fc_disc_init(lport);
fc_disc_config(lport, priv);
return 0; return 0;
} }

25
drivers/scsi/libfc/fc_disc.c
View File

@ -712,13 +712,13 @@ static void fc_disc_stop_final(struct fc_lport *lport)
} }
/** /**
* fc_disc_init() - Initialize the discovery layer for a local port * fc_disc_config() - Configure the discovery layer for a local port
* @lport: The local port that needs the discovery layer to be initialized * @lport: The local port that needs the discovery layer to be configured
* @priv: Private data structre for users of the discovery layer * @priv: Private data structre for users of the discovery layer
*/ */
int fc_disc_init(struct fc_lport *lport, void *priv) void fc_disc_config(struct fc_lport *lport, void *priv)
{ {
struct fc_disc *disc; struct fc_disc *disc = &lport->disc;
if (!lport->tt.disc_start) if (!lport->tt.disc_start)
lport->tt.disc_start = fc_disc_start; lport->tt.disc_start = fc_disc_start;
@ -733,12 +733,21 @@ int fc_disc_init(struct fc_lport *lport, void *priv)
lport->tt.disc_recv_req = fc_disc_recv_req; lport->tt.disc_recv_req = fc_disc_recv_req;
disc = &lport->disc; disc = &lport->disc;
disc->priv = priv;
}
EXPORT_SYMBOL(fc_disc_config);
/**
* fc_disc_init() - Initialize the discovery layer for a local port
* @lport: The local port that needs the discovery layer to be initialized
*/
void fc_disc_init(struct fc_lport *lport)
{
struct fc_disc *disc = &lport->disc;
INIT_DELAYED_WORK(&disc->disc_work, fc_disc_timeout); INIT_DELAYED_WORK(&disc->disc_work, fc_disc_timeout);
mutex_init(&disc->disc_mutex); mutex_init(&disc->disc_mutex);
INIT_LIST_HEAD(&disc->rports); INIT_LIST_HEAD(&disc->rports);
disc->priv = priv;
return 0;
} }
EXPORT_SYMBOL(fc_disc_init); EXPORT_SYMBOL(fc_disc_init);

3
include/scsi/libfc.h
View File

@ -1074,7 +1074,8 @@ void fc_rport_terminate_io(struct fc_rport *);
/* /*
* DISCOVERY LAYER * DISCOVERY LAYER
*****************************/ *****************************/
int fc_disc_init(struct fc_lport *, void *); void fc_disc_init(struct fc_lport *);
void fc_disc_config(struct fc_lport *, void *);
static inline struct fc_lport *fc_disc_lport(struct fc_disc *disc) static inline struct fc_lport *fc_disc_lport(struct fc_disc *disc)
{ {