Commit 0a1f87cb authored Sep 18, 2009 by Don Skidmore Committed by David S. Miller Sep 21, 2009

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>

parent dedcf297

drivers/net/ixgbe/ixgbe_main.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);