diff options
| author |   Robert Love <robert.w.love@intel.com> | 2013-03-25 11:00:27 -0700 |
|---|---|---|
| committer | Robert Love <robert.w.love@intel.com> | 2013-03-25 16:01:10 -0700 |
| commit | 8a9a71381208b2364a2d12b0d257ae333917a1bc (patch) | |
| tree | 3ed22690783800d22ddc569983bb0e069ea0de9d /drivers/scsi/libfc/fc_disc.c | |
| parent | fcoe: Fix deadlock between create and destroy paths (diff) | |
| download | linux-dev-8a9a71381208b2364a2d12b0d257ae333917a1bc.tar.xz linux-dev-8a9a71381208b2364a2d12b0d257ae333917a1bc.zip | |
libfc, fcoe, bnx2fc: Always use fcoe_disc_init for discovery layer initialization
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 <robert.w.love@intel.com>
Tested-by: Jack Morgan <jack.morgan@intel.com>
Reviewed-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Diffstat (limited to 'drivers/scsi/libfc/fc_disc.c')
| -rw-r--r-- | drivers/scsi/libfc/fc_disc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c index 8e561e6a557c..141c54b97082 100644 --- a/drivers/scsi/libfc/fc_disc.c +++ b/drivers/scsi/libfc/fc_disc.c @@ -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; } |