diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2008-07-18 20:50:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-18 20:50:57 -0400 |
commit | 076152d534c6d99ccfe59190d085781a2d4a419b (patch) | |
tree | b20b6c79973231ba3c9a8cbe0fb1bfce2c89e3f3 /drivers/net/e1000 | |
parent | d55b53fff0c2ddb639dca04c3f5a0854f292d982 (diff) |
e1000: resolve tx multiqueue bug
With the recent changes to tx mutiqueue, e1000 was not calling
netif_start_queue() before calling netif_wake_queue().
This causes an oops during loading of the driver.
(Based on commit d55b53fff0c2ddb639dca04c3f5a0854f292d982
("igb/ixgbe/e1000e: resolve tx multiqueue bug").)
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index f8df8bd7fcbe..cf12b05cd011 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -1472,6 +1472,8 @@ e1000_open(struct net_device *netdev) | |||
1472 | 1472 | ||
1473 | e1000_irq_enable(adapter); | 1473 | e1000_irq_enable(adapter); |
1474 | 1474 | ||
1475 | netif_start_queue(netdev); | ||
1476 | |||
1475 | /* fire a link status change interrupt to start the watchdog */ | 1477 | /* fire a link status change interrupt to start the watchdog */ |
1476 | E1000_WRITE_REG(&adapter->hw, ICS, E1000_ICS_LSC); | 1478 | E1000_WRITE_REG(&adapter->hw, ICS, E1000_ICS_LSC); |
1477 | 1479 | ||