diff options
| author | Alexander V. Lukyanov <lav@netis.ru> | 2010-11-29 22:57:39 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-02 16:24:07 -0500 |
| commit | e7dfc8dbdf9a7fa1ef04c63100a71f4102b82ed3 (patch) | |
| tree | cd187ef8077f31e537bb1083b31c70a023ffd8c0 /drivers | |
| parent | f8e9616108c7003e6499c162459258f11c9dc85e (diff) | |
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')
| -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 a9f7d5d1a26..7064e035757 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, | |||
| 688 | 688 | ||
| 689 | DMFE_DBUG(0, "dmfe_start_xmit", 0); | 689 | DMFE_DBUG(0, "dmfe_start_xmit", 0); |
| 690 | 690 | ||
| 691 | /* Resource flag check */ | ||
| 692 | netif_stop_queue(dev); | ||
| 693 | |||
| 694 | /* Too large packet check */ | 691 | /* Too large packet check */ |
| 695 | if (skb->len > MAX_PACKET_SIZE) { | 692 | if (skb->len > MAX_PACKET_SIZE) { |
| 696 | pr_err("big packet = %d\n", (u16)skb->len); | 693 | pr_err("big packet = %d\n", (u16)skb->len); |
| @@ -698,6 +695,9 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb, | |||
| 698 | return NETDEV_TX_OK; | 695 | return NETDEV_TX_OK; |
| 699 | } | 696 | } |
| 700 | 697 | ||
| 698 | /* Resource flag check */ | ||
| 699 | netif_stop_queue(dev); | ||
| 700 | |||
| 701 | spin_lock_irqsave(&db->lock, flags); | 701 | spin_lock_irqsave(&db->lock, flags); |
| 702 | 702 | ||
| 703 | /* No Tx resource check, it never happen nromally */ | 703 | /* No Tx resource check, it never happen nromally */ |
