From 680c5ebe46f1ab9123ddbcf6603ace08817da310 Mon Sep 17 00:00:00 2001 From: Emil Tantilov Date: Sat, 27 Aug 2011 07:18:37 +0000 Subject: [PATCH] --- yaml --- r: 266422 b: refs/heads/master c: 7edebf9a6aac07e2ebb3901b60672293a7139ad0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 46ebdb487c42..ecb248ba2028 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ce9d6c725b01989d2b18ee1df853837388ceaf6 +refs/heads/master: 7edebf9a6aac07e2ebb3901b60672293a7139ad0 diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 9cd44adcea14..ed922726daab 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -5978,7 +5978,8 @@ static void ixgbe_spoof_check(struct ixgbe_adapter *adapter) static void ixgbe_watchdog_subtask(struct ixgbe_adapter *adapter) { /* if interface is down do nothing */ - if (test_bit(__IXGBE_DOWN, &adapter->state)) + if (test_bit(__IXGBE_DOWN, &adapter->state) || + test_bit(__IXGBE_RESETTING, &adapter->state)) return; ixgbe_watchdog_update_link(adapter);