---

yaml --- r: 166223 b: refs/heads/master c: 0a1f87c h: refs/heads/master i: 166221: c9ee221 166219: 2c42dae 166215: 6ed2b45 166207: 398acf8 v: v3
git-mirror · Sep 21, 2009 · 4422622 · 4422622
1 parent baff993
commit 4422622
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);