From: Don Skidmore <donald.c.skidmore@intel.com>
Date: Fri, 18 Sep 2009 09:45:43 +0000 (+0000)
Subject: ixgbe: fix sfp_timer clean up in ixgbe_down
X-Git-Tag: firefly_0821_release~11864^2~322
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0a1f87cbdbf26e1257b36cc5e9c00a08c2236ff2;p=firefly-linux-kernel-4.4.55.git

ixgbe: fix sfp_timer clean up in ixgbe_down

We weren't stoping the sfp_timer after the device was brought down.
This patch properly cleans up.

Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 59ad9590e700..056434c9831c 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2926,6 +2926,8 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
 
 	ixgbe_napi_disable_all(adapter);
 
+	clear_bit(__IXGBE_SFP_MODULE_NOT_FOUND, &adapter->state);
+	del_timer_sync(&adapter->sfp_timer);
 	del_timer_sync(&adapter->watchdog_timer);
 	cancel_work_sync(&adapter->watchdog_task);