summaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorRobert Love <robert.w.love@intel.com>2013-03-25 19:00:27 +0100
committerRobert Love <robert.w.love@intel.com>2013-03-26 00:01:10 +0100
commit8a9a71381208b2364a2d12b0d257ae333917a1bc (patch)
tree3ed22690783800d22ddc569983bb0e069ea0de9d /include/scsi
parentfcoe: Fix deadlock between create and destroy paths (diff)
downloadlinux-8a9a71381208b2364a2d12b0d257ae333917a1bc.tar.xz
linux-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 'include/scsi')
-rw-r--r--include/scsi/libfc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 399162b50a8d..add2a498bd44 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -1074,7 +1074,7 @@ void fc_rport_terminate_io(struct fc_rport *);
/*
* DISCOVERY LAYER
*****************************/
-int fc_disc_init(struct fc_lport *);
+int fc_disc_init(struct fc_lport *, void *);
static inline struct fc_lport *fc_disc_lport(struct fc_disc *disc)
{