From 4422622f1d88771753063025b5ce8a9f338e8d7f Mon Sep 17 00:00:00 2001
From: Don Skidmore <donald.c.skidmore@intel.com>
Date: Fri, 18 Sep 2009 09:45:43 +0000
Subject: [PATCH] --- yaml --- r: 166223 b: refs/heads/master c:
 0a1f87cbdbf26e1257b36cc5e9c00a08c2236ff2 h: refs/heads/master i:   166221:
 c9ee2218f96d882469ee8efc9123925ffc4cf0c8   166219:
 2c42dae477e64032dbe0df1500599f082dca8223   166215:
 6ed2b4509f7a2862a97b014e045f9b3d1306f5aa   166207:
 398acf8547926f74316f903471738428222dfbd1 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/ixgbe/ixgbe_main.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 09511b7fde93..aeb0c7db895e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dedcf2971c250473e724b642c0100d3621116616
+refs/heads/master: 0a1f87cbdbf26e1257b36cc5e9c00a08c2236ff2
diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c
index 59ad9590e700..056434c9831c 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_main.c
+++ b/trunk/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);