diff --git a/[refs] b/[refs] index c75f552334a6..7e0c10294672 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29afd690636dab36fe437c54b3a9d5e093bdcd9b +refs/heads/master: 4c86e0b9455c8fa8122fc2d10935e892838c8568 diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index a1a5a6f15a65..63458270ce1b 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/drivers/net/e1000e/netdev.c @@ -3627,7 +3627,7 @@ static void e1000_watchdog_task(struct work_struct *work) case SPEED_100: txb2b = 0; netdev->tx_queue_len = 100; - /* maybe add some timeout factor ? */ + adapter->tx_timeout_factor = 10; break; }