diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-04-16 17:35:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-16 17:35:26 -0700 |
| commit | a54bfa40fd16aeb90bc556189221576f746f8567 (patch) | |
| tree | 176bb7a99ffab5f42f0dd4e9671f335be3f3efa0 /drivers/net/skge.c | |
| parent | fec: call fec_restart() in fec_open() (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 (diff) | |
| download | linux-dev-a54bfa40fd16aeb90bc556189221576f746f8567.tar.xz linux-dev-a54bfa40fd16aeb90bc556189221576f746f8567.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/skge.c')
| -rw-r--r-- | drivers/net/skge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index b8978d4af1b7..c11cdd08ec57 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c @@ -2674,7 +2674,7 @@ static int skge_down(struct net_device *dev) if (netif_msg_ifdown(skge)) printk(KERN_INFO PFX "%s: disabling interface\n", dev->name); - netif_stop_queue(dev); + netif_tx_disable(dev); if (hw->chip_id == CHIP_ID_GENESIS && hw->phy_type == SK_PHY_XMAC) del_timer_sync(&skge->link_timer); @@ -2881,7 +2881,6 @@ static void skge_tx_clean(struct net_device *dev) } skge->tx_ring.to_clean = e; - netif_wake_queue(dev); } static void skge_tx_timeout(struct net_device *dev) @@ -2893,6 +2892,7 @@ static void skge_tx_timeout(struct net_device *dev) skge_write8(skge->hw, Q_ADDR(txqaddr[skge->port], Q_CSR), CSR_STOP); skge_tx_clean(dev); + netif_wake_queue(dev); } static int skge_change_mtu(struct net_device *dev, int new_mtu) |