From da77c097d053e264a93dc938bdb99b1801bf6e2b Mon Sep 17 00:00:00 2001
From: Jesse Brandeburg <jesse.brandeburg@intel.com>
Date: Thu, 7 May 2009 11:07:35 +0000
Subject: [PATCH] --- yaml --- r: 150123 b: refs/heads/master c:
 c2d5ab4973bfaa72cbb677801825ce56c8f69b56 h: refs/heads/master i:   150121:
 17e2a00f1ec201aaa9c545b24710bcea5698e8ea   150119:
 10abeb8238ee69ebf3a3e1c752a0d8fef0ffddff v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/e1000/e1000_main.c | 2 ++
 trunk/drivers/net/e1000e/netdev.c    | 2 ++
 trunk/drivers/net/igb/igb_main.c     | 2 ++
 trunk/drivers/net/ixgb/ixgb_main.c   | 2 ++
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b6824ffc61cf..b870b956382d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9c7d2e5a06cd3a26b6be096949e3371ec2aa123
+refs/heads/master: c2d5ab4973bfaa72cbb677801825ce56c8f69b56
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index 71d4fe15976a..b455dca0901e 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -2646,6 +2646,8 @@ static void e1000_watchdog(unsigned long data)
 			 * (Do the reset outside of interrupt context). */
 			adapter->tx_timeout_count++;
 			schedule_work(&adapter->reset_task);
+			/* return immediately since reset is imminent */
+			return;
 		}
 	}
 
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c
index da6b37e05bea..ccaaee0951cf 100644
--- a/trunk/drivers/net/e1000e/netdev.c
+++ b/trunk/drivers/net/e1000e/netdev.c
@@ -3651,6 +3651,8 @@ static void e1000_watchdog_task(struct work_struct *work)
 			 */
 			adapter->tx_timeout_count++;
 			schedule_work(&adapter->reset_task);
+			/* return immediately since reset is imminent */
+			return;
 		}
 	}
 
diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c
index 8de8629b07ec..8784c051707e 100644
--- a/trunk/drivers/net/igb/igb_main.c
+++ b/trunk/drivers/net/igb/igb_main.c
@@ -2711,6 +2711,8 @@ static void igb_watchdog_task(struct work_struct *work)
 			 * (Do the reset outside of interrupt context). */
 			adapter->tx_timeout_count++;
 			schedule_work(&adapter->reset_task);
+			/* return immediately since reset is imminent */
+			return;
 		}
 	}
 
diff --git a/trunk/drivers/net/ixgb/ixgb_main.c b/trunk/drivers/net/ixgb/ixgb_main.c
index cb9ecc48f6d0..04cb81a739c2 100644
--- a/trunk/drivers/net/ixgb/ixgb_main.c
+++ b/trunk/drivers/net/ixgb/ixgb_main.c
@@ -1140,6 +1140,8 @@ ixgb_watchdog(unsigned long data)
 			 * to get done, so reset controller to flush Tx.
 			 * (Do the reset outside of interrupt context). */
 			schedule_work(&adapter->tx_timeout_task);
+			/* return immediately since reset is imminent */
+			return;
 		}
 	}