A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

libfc, fcoe, bnx2fc: Always use fcoe_disc_init for discovery layer initialization

Browse source 
Currently libfcoe is doing some libfc discovery layer initialization outside of
libfc. This patch moves this code into libfc and sets up a split in discovery
(one time) initialization code and (re-configurable) settings that will come in
the next patch.

Signed-off-by: Robert Love <[email protected]>
Tested-by: Jack Morgan <[email protected]>
Reviewed-by: Bhanu Prakash Gollapudi <[email protected]>
This commit is contained in:
Robert Love 2013-03-25 11:00:27 -07:00
commit 8a9a713812
4 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
View file

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

11
drivers/scsi/fcoe/fcoe_ctlr.c
View file

@ -2826,6 +2826,8 @@ unlock:
int fcoe_libfc_config(struct fc_lport *lport, struct fcoe_ctlr *fip,
const struct libfc_function_template *tt, int init_fcp)
{
void *priv = lport;
/* Set the function pointers set by the LLDD */
memcpy(&lport->tt, tt, sizeof(*tt));
if (init_fcp && fc_fcp_init(lport))
@ -2842,12 +2844,11 @@ int fcoe_libfc_config(struct fc_lport *lport, struct fcoe_ctlr *fip,
lport->tt.disc_start = fcoe_ctlr_disc_start;
lport->tt.disc_stop = fcoe_ctlr_disc_stop;
lport->tt.disc_stop_final = fcoe_ctlr_disc_stop_final;
mutex_init(&lport->disc.disc_mutex);
INIT_LIST_HEAD(&lport->disc.rports);
lport->disc.priv = fip;
} else {
fc_disc_init(lport);
priv = fip;
}
fc_disc_init(lport, priv);
return 0;
}
EXPORT_SYMBOL_GPL(fcoe_libfc_config);

5
drivers/scsi/libfc/fc_disc.c
View file

@ -714,8 +714,9 @@ static void fc_disc_stop_final(struct fc_lport *lport)
/**
* fc_disc_init() - Initialize the discovery layer for a local port
* @lport: The local port that needs the discovery layer to be initialized
* @priv: Private data structre for users of the discovery layer
*/
int fc_disc_init(struct fc_lport *lport)
int fc_disc_init(struct fc_lport *lport, void *priv)
{
struct fc_disc *disc;
@ -736,7 +737,7 @@ int fc_disc_init(struct fc_lport *lport)
mutex_init(&disc->disc_mutex);
INIT_LIST_HEAD(&disc->rports);
disc->priv = lport;
disc->priv = priv;
return 0;
}