]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
e1000: resolve tx multiqueue bug
authorBen Hutchings <bhutchings@solarflare.com>
Sat, 19 Jul 2008 00:50:57 +0000 (17:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 19 Jul 2008 00:50:57 +0000 (17:50 -0700)
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>
drivers/net/e1000/e1000_main.c

index f8df8bd7fcbe82bc6d590b0c2fa7a17681e6326e..cf12b05cd011fcbd4db80d12273731d4c4ff9c03 100644 (file)
@@ -1472,6 +1472,8 @@ e1000_open(struct net_device *netdev)
 
        e1000_irq_enable(adapter);
 
+       netif_start_queue(netdev);
+
        /* fire a link status change interrupt to start the watchdog */
        E1000_WRITE_REG(&adapter->hw, ICS, E1000_ICS_LSC);