igb/ixgbe/e1000e: resolve tx multiqueue bug
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 18 Jul 2008 11:33:03 +0000 (04:33 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Jul 2008 11:33:03 +0000 (04:33 -0700)
With the recent changes to tx mutiqueue, igb/ixgbe/e1000e was not calling
netif_tx_start_all_queues() before calling netif_tx_wake_all_queues().
This causes an issue during loading of the driver.

In addition, updated e1000e to use the updated tx mutliqueue api.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/e1000e/netdev.c
drivers/net/igb/igb_main.c
drivers/net/ixgbe/ixgbe_main.c

index be5953385bf66b8f9354d2b91839d5e3d7a0278f..869544b8c05c2b184ccf3703398419af2cc550f0 100644 (file)
@@ -2513,7 +2513,7 @@ void e1000e_down(struct e1000_adapter *adapter)
        ew32(RCTL, rctl & ~E1000_RCTL_EN);
        /* flush and sleep below */
 
-       netif_stop_queue(netdev);
+       netif_tx_stop_all_queues(netdev);
 
        /* disable transmits in the hardware */
        tctl = er32(TCTL);
@@ -2663,6 +2663,8 @@ static int e1000_open(struct net_device *netdev)
 
        e1000_irq_enable(adapter);
 
+       netif_tx_start_all_queues(netdev);
+
        /* fire a link status change interrupt to start the watchdog */
        ew32(ICS, E1000_ICS_LSC);
 
@@ -3118,7 +3120,7 @@ static void e1000_watchdog_task(struct work_struct *work)
                        ew32(TCTL, tctl);
 
                        netif_carrier_on(netdev);
-                       netif_wake_queue(netdev);
+                       netif_tx_wake_all_queues(netdev);
 
                        if (!test_bit(__E1000_DOWN, &adapter->state))
                                mod_timer(&adapter->phy_info_timer,
@@ -3130,7 +3132,7 @@ static void e1000_watchdog_task(struct work_struct *work)
                        adapter->link_duplex = 0;
                        ndev_info(netdev, "Link is Down\n");
                        netif_carrier_off(netdev);
-                       netif_stop_queue(netdev);
+                       netif_tx_stop_all_queues(netdev);
                        if (!test_bit(__E1000_DOWN, &adapter->state))
                                mod_timer(&adapter->phy_info_timer,
                                          round_jiffies(jiffies + 2 * HZ));
@@ -4504,7 +4506,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 
        /* tell the stack to leave us alone until e1000_open() is called */
        netif_carrier_off(netdev);
-       netif_stop_queue(netdev);
+       netif_tx_stop_all_queues(netdev);
 
        strcpy(netdev->name, "eth%d");
        err = register_netdev(netdev);
index 81bba6983ddea9f7d2779044bb9e41b2401edf1b..1b7cb29fe68e23eb8900baa00cca1064bec61c05 100644 (file)
@@ -1493,6 +1493,8 @@ static int igb_open(struct net_device *netdev)
 
        igb_irq_enable(adapter);
 
+       netif_tx_start_all_queues(netdev);
+
        /* Fire a link status change interrupt to start the watchdog. */
        wr32(E1000_ICS, E1000_ICS_LSC);
 
index 6af8fb5c4b5fd0b9ac2f008e72270bdfcd257e18..be7b723c924f941a806c9faf66f11168c9625f5b 100644 (file)
@@ -2765,6 +2765,8 @@ static int ixgbe_open(struct net_device *netdev)
        if (err)
                goto err_up;
 
+       netif_tx_start_all_queues(netdev);
+
        return 0;
 
 err_up: