[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>

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 {
  * @port_ka_time:  time of next port keep-alive.
  * @ctlr_ka_time:  time of next controller keep-alive.
  * @timer:         timer struct used for all delayed events.
- * @link_work:     &work_struct for doing FCF selection.
+ * @timer_work:    &work_struct for doing keep-alives and resets.
  * @recv_work:     &work_struct for receiving FIP frames.
  * @fip_recv_list: list of received FIP frames.
  * @user_mfs:      configured maximum FC frame size, including FC header.
  * @flogi_oxid:    exchange ID of most recent fabric login.
  * @flogi_count:   number of FLOGI attempts in AUTO mode.
- * @link:          current link status for libfc.
- * @last_link:     last link state reported to libfc.
  * @map_dest:      use the FC_MAP mode for destination MAC addresses.
  * @spma:          supports SPMA server-provided MACs mode
  * @send_ctlr_ka:  need to send controller keep alive
@@ -100,14 +98,12 @@ struct fcoe_ctlr {
         unsigned long port_ka_time;
         unsigned long ctlr_ka_time;
         struct timer_list timer;
-        struct work_struct link_work;
+        struct work_struct timer_work;
         struct work_struct recv_work;
         struct sk_buff_head fip_recv_list;
         u16 user_mfs;
         u16 flogi_oxid;
         u8 flogi_count;
-        u8 link;
-        u8 last_link;
         u8 reset_req;
         u8 map_dest;
         u8 spma;