diff options
| author |   Don Skidmore <donald.c.skidmore@intel.com> | 2009-09-18 09:45:43 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-09-21 11:32:29 -0700 |
| commit | 0a1f87cbdbf26e1257b36cc5e9c00a08c2236ff2 (patch) | |
| tree | 410d4028ec4f13b6da9ecae1f6c2decae698906a /drivers/net/ixgbe/ixgbe_main.c | |
| parent | net: fix CONFIG_NET=n build on sparc64 (diff) | |
| download | linux-dev-0a1f87cbdbf26e1257b36cc5e9c00a08c2236ff2.tar.xz linux-dev-0a1f87cbdbf26e1257b36cc5e9c00a08c2236ff2.zip | |
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>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
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); |