From: Ben Hutchings Date: Sat, 19 Jul 2008 00:50:57 +0000 (-0700) Subject: e1000: resolve tx multiqueue bug X-Git-Tag: v2.6.27-rc1~969^2~32 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=076152d534c6d99ccfe59190d085781a2d4a419b;p=linux-2.6-omap-h63xx.git 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 Acked-by: Jeff Kirsher Signed-off-by: David S. Miller --- diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index f8df8bd7fcb..cf12b05cd01 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) 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);