diff options
| author | Alexander V. Lukyanov <lav@netis.ru> | 2010-11-30 04:57:39 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-02 22:24:07 +0100 |
| commit | e7dfc8dbdf9a7fa1ef04c63100a71f4102b82ed3 (patch) | |
| tree | cd187ef8077f31e537bb1083b31c70a023ffd8c0 /drivers/net/tulip/dmfe.c | |
| parent | stmmac: priv->lock can be used uninitialized (diff) | |
| download | linux-e7dfc8dbdf9a7fa1ef04c63100a71f4102b82ed3.tar.xz linux-e7dfc8dbdf9a7fa1ef04c63100a71f4102b82ed3.zip | |
tulip: fix hang in dmfe driver on sending of big packet
This patch fixes hang in dmfe driver on attempt of sending a big packet.
Without this patch the code stops the queue and never wakes it again.
Signed-off-by: Alexander V. Lukyanov <lav@netis.ru>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tulip/dmfe.c')
| -rw-r--r-- | drivers/net/tulip/dmfe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c index a9f7d5d1a269..7064e035757a 100644 --- a/drivers/net/tulip/dmfe.c +++ b/drivers/net/tulip/dmfe.c @@ -688,9 +688,6 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb, DMFE_DBUG(0, "dmfe_start_xmit", 0); - /* Resource flag check */ - netif_stop_queue(dev); - /* Too large packet check */ if (skb->len > MAX_PACKET_SIZE) { pr_err("big packet = %d\n", (u16)skb->len); @@ -698,6 +695,9 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb, return NETDEV_TX_OK; } + /* Resource flag check */ + netif_stop_queue(dev); + spin_lock_irqsave(&db->lock, flags); /* No Tx resource check, it never happen nromally */ |