---

yaml
---
r: 150123
b: refs/heads/master
c: c2d5ab4
h: refs/heads/master
i:
  150121: 17e2a00
  150119: 10abeb8
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9c7d2e5a06cd3a26b6be096949e3371ec2aa123
+refs/heads/master: c2d5ab4973bfaa72cbb677801825ce56c8f69b56

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;
 		}
 	}
 

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;
 		}
 	}
 

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;
 		}
 	}
 

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;
 		}
 	}