aboutsummaryrefslogtreecommitdiffstats
path: root/include/scsi/libfcoe.h
diff options
context:
space:
mode:
authorJoe Eykholt <jeykholt@cisco.com>2010-03-12 19:08:23 -0500
committerJames Bottomley <James.Bottomley@suse.de>2010-04-11 10:23:38 -0400
commit4291365784c9622c9d643cf23421f9c7b9662d71 (patch)
tree46b938bd7ea401da7d61ad7e63b80d0bcd8b0f71 /include/scsi/libfcoe.h
parent50036bbae0ed4d4e610bd59e0ce285ed20c1bee6 (diff)
[SCSI] libfcoe: eliminate unused link and last_link fields
The link and last_link fields in the fcoe_ctlr struct are no longer useful, since they are always set to the same value, and FIP always calls libfc to pass link information to the lport. Eliminate those fields and rename link_work to timer_work, since it no longer has any link change work to do. Thanks to Brian Uchino for discovering this issue. Signed-off-by: Joe Eykholt <jeykholt@cisco.com> Signed-off-by: Robert Love <robert.w.love@intel.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'include/scsi/libfcoe.h')
-rw-r--r--include/scsi/libfcoe.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index c603f4a7e7fc..868ed26a9767 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -65,14 +65,12 @@ enum fip_state {
65 * @port_ka_time: time of next port keep-alive. 65 * @port_ka_time: time of next port keep-alive.
66 * @ctlr_ka_time: time of next controller keep-alive. 66 * @ctlr_ka_time: time of next controller keep-alive.
67 * @timer: timer struct used for all delayed events. 67 * @timer: timer struct used for all delayed events.
68 * @link_work: &work_struct for doing FCF selection. 68 * @timer_work: &work_struct for doing keep-alives and resets.
69 * @recv_work: &work_struct for receiving FIP frames. 69 * @recv_work: &work_struct for receiving FIP frames.
70 * @fip_recv_list: list of received FIP frames. 70 * @fip_recv_list: list of received FIP frames.
71 * @user_mfs: configured maximum FC frame size, including FC header. 71 * @user_mfs: configured maximum FC frame size, including FC header.
72 * @flogi_oxid: exchange ID of most recent fabric login. 72 * @flogi_oxid: exchange ID of most recent fabric login.
73 * @flogi_count: number of FLOGI attempts in AUTO mode. 73 * @flogi_count: number of FLOGI attempts in AUTO mode.
74 * @link: current link status for libfc.
75 * @last_link: last link state reported to libfc.
76 * @map_dest: use the FC_MAP mode for destination MAC addresses. 74 * @map_dest: use the FC_MAP mode for destination MAC addresses.
77 * @spma: supports SPMA server-provided MACs mode 75 * @spma: supports SPMA server-provided MACs mode
78 * @send_ctlr_ka: need to send controller keep alive 76 * @send_ctlr_ka: need to send controller keep alive
@@ -100,14 +98,12 @@ struct fcoe_ctlr {
100 unsigned long port_ka_time; 98 unsigned long port_ka_time;
101 unsigned long ctlr_ka_time; 99 unsigned long ctlr_ka_time;
102 struct timer_list timer; 100 struct timer_list timer;
103 struct work_struct link_work; 101 struct work_struct timer_work;
104 struct work_struct recv_work; 102 struct work_struct recv_work;
105 struct sk_buff_head fip_recv_list; 103 struct sk_buff_head fip_recv_list;
106 u16 user_mfs; 104 u16 user_mfs;
107 u16 flogi_oxid; 105 u16 flogi_oxid;
108 u8 flogi_count; 106 u8 flogi_count;
109 u8 link;
110 u8 last_link;
111 u8 reset_req; 107 u8 reset_req;
112 u8 map_dest; 108 u8 map_dest;
113 u8 spma; 109 u8 spma;