From 29b8617d83aae243c5eb4e2d11492c039fb3252a Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Fri, 8 Aug 2008 18:36:01 -0700
Subject: [PATCH] --- yaml --- r: 108767 b: refs/heads/master c:
 10f1b492135620a87970cad9f80439249dcce299 h: refs/heads/master i:   108765:
 52adcdddbfbc7783efb2f4e562af4f8c55325ead   108763:
 e33582efcd259ff9c33c8a5cc3f75441aed667b1   108759:
 51118fcba28ad269bca36a49b4b47bad96f7bfb2   108751:
 63073f922fa33db10a353d1af13bbe1232ab59ab   108735:
 11399d1f8ab0fd626b350f266ee23592bf5a8ebe v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/e1000e/netdev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0546a2917a38..4643f9ab7aa8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 808ff676c46d8e259c2cb38579f94f8e6ae38009
+refs/heads/master: 10f1b492135620a87970cad9f80439249dcce299
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c
index efa944509a39..4573c7b9cbd9 100644
--- a/trunk/drivers/net/e1000e/netdev.c
+++ b/trunk/drivers/net/e1000e/netdev.c
@@ -3058,7 +3058,7 @@ static void e1000_watchdog_task(struct work_struct *work)
 			case SPEED_10:
 				txb2b = 0;
 				netdev->tx_queue_len = 10;
-				adapter->tx_timeout_factor = 14;
+				adapter->tx_timeout_factor = 16;
 				break;
 			case SPEED_100:
 				txb2b = 0;