Fnic: For Standalone C series, "sending VLAN request" message seen even if the link...

When physical link between standalone C series and switch is down,
the fip timer is not turned off and timer expiration will keep sending
vlan request.

It can be fixed by stopping the fip_timer and
it will be restarted automatically when Link is up.

- Increment fnic version from 1.6.0.14 to 1.6.0.15

Signed-off-by: Hiral Shah <hishah@cisco.com>
Signed-off-by: Sesidhar Baddela <sebaddel@cisco.com>
Signed-off-by: Anil Chintalapati <achintal@cisco.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h
index 5336e8d21704fd8aac15d364297086741c1d7ade..977960b03c9fb03e70b77f6c446c31ccc7b4c8c8 100644 (file)
--- a/drivers/scsi/fnic/fnic.h
+++ b/drivers/scsi/fnic/fnic.h
@@ -39,7 +39,7 @@
 
 #define DRV_NAME               "fnic"
 #define DRV_DESCRIPTION                "Cisco FCoE HBA Driver"
-#define DRV_VERSION            "1.6.0.14"
+#define DRV_VERSION            "1.6.0.15"
 #define PFX                    DRV_NAME ": "
 #define DFX                     DRV_NAME "%d: "
 

diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c
index f3984b48f8e96e19f92bd07f11467a625f3eae0c..bf0bbd42efb5d9d13b3289ee24c7ba6e852df6df 100644 (file)
--- a/drivers/scsi/fnic/fnic_fcs.c
+++ b/drivers/scsi/fnic/fnic_fcs.c
@@ -135,6 +135,11 @@ void fnic_handle_link(struct work_struct *work)
                        fnic->lport->host->host_no, FNIC_FC_LE,
                        "Link Status: UP_DOWN",
                        strlen("Link Status: UP_DOWN"));
+               if (fnic->config.flags & VFCF_FIP_CAPABLE) {
+                       FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host,
+                               "deleting fip-timer during link-down\n");
+                       del_timer_sync(&fnic->fip_timer);
+               }
                fcoe_ctlr_link_down(&fnic->ctlr);
        }