diff options
Diffstat (limited to 'include/scsi')
-rw-r--r-- | include/scsi/libfcoe.h | 8 |
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; |