diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-01 18:06:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-01 18:06:00 -0400 |
| commit | dc543f9e2de1a5c9e48c800439db84f95d365c77 (patch) | |
| tree | be61e1e81984c52893d1154ebf21230393ccf31f /include | |
| parent | 3658f3604066d5500ebd73a04084f127dc779441 (diff) | |
| parent | 0db0e377ab5be5d507a2fca3d78215cd2e83b974 (diff) | |
Merge tag 'for-3.9-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rwlove/fcoe
Pull FCoE fixes from Robert Love:
"Critical patches to fix FCoE VN2VN mode with new interfaces targeting
3.9-rc"
* tag 'for-3.9-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rwlove/fcoe:
libfcoe: Fix fcoe_sysfs VN2VN mode
libfc, fcoe, bnx2fc: Split fc_disc_init into fc_disc_{init, config}
libfc, fcoe, bnx2fc: Always use fcoe_disc_init for discovery layer initialization
fcoe: Fix deadlock between create and destroy paths
bnx2fc: Make the fcoe_cltr the SCSI host parent
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/libfc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h index 399162b50a8d..e1379b4e8faf 100644 --- a/include/scsi/libfc.h +++ b/include/scsi/libfc.h | |||
| @@ -1074,7 +1074,8 @@ void fc_rport_terminate_io(struct fc_rport *); | |||
| 1074 | /* | 1074 | /* |
| 1075 | * DISCOVERY LAYER | 1075 | * DISCOVERY LAYER |
| 1076 | *****************************/ | 1076 | *****************************/ |
| 1077 | int fc_disc_init(struct fc_lport *); | 1077 | void fc_disc_init(struct fc_lport *); |
| 1078 | void fc_disc_config(struct fc_lport *, void *); | ||
| 1078 | 1079 | ||
| 1079 | static inline struct fc_lport *fc_disc_lport(struct fc_disc *disc) | 1080 | static inline struct fc_lport *fc_disc_lport(struct fc_disc *disc) |
| 1080 | { | 1081 | { |