From 181173078bb102d720e149f2de5dc88d227b93c0 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Tue, 14 Apr 2009 15:16:55 -0700 Subject: [PATCH] --- yaml --- r: 143454 b: refs/heads/master c: d119b3927994e3d620d6adb0dd1ea6bf24427875 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/skge.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b9df0306a00c..dc93a65532d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc59f9a3bf8096a1f68a8b78ada7a0e0ab9236b2 +refs/heads/master: d119b3927994e3d620d6adb0dd1ea6bf24427875 diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c index b8978d4af1b7..c11cdd08ec57 100644 --- a/trunk/drivers/net/skge.c +++ b/trunk/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)