diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2008-07-18 04:33:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 04:33:03 -0700 |
| commit | d55b53fff0c2ddb639dca04c3f5a0854f292d982 (patch) | |
| tree | 39164a0c3a820f0767f2ad98c828a36c35c9b1da | |
| parent | b6fcbdb4f283f7ba67cec3cda6be23da8e959031 (diff) | |
igb/ixgbe/e1000e: resolve tx multiqueue bug
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>
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 10 | ||||
| -rw-r--r-- | drivers/net/igb/igb_main.c | 2 | ||||
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index be5953385bf6..869544b8c05c 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -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); diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 81bba6983dde..1b7cb29fe68e 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -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); diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 6af8fb5c4b5f..be7b723c924f 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -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: |