diff options
author | Ron Mercer <ron.mercer@qlogic.com> | 2009-03-11 11:55:43 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-13 11:27:25 -0700 |
commit | 855b0993f216a9b0f9cb33573bd05e314105d86c (patch) | |
tree | 02c0aa88e9d92642255f3012ebbf4556ae55eedf | |
parent | 6612a6344aba8ba7b5af67cd006453bfedbb2967 (diff) | |
download | linux-stable-855b0993f216a9b0f9cb33573bd05e314105d86c.tar.gz linux-stable-855b0993f216a9b0f9cb33573bd05e314105d86c.tar.bz2 linux-stable-855b0993f216a9b0f9cb33573bd05e314105d86c.zip |
qlge: bugfix: Pad outbound frames smaller than 60 bytes.
With some asic configurations xmit of frames smaller than 60 bytes may
fail.
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/qlge/qlge_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 00c37c0f8a90..91191f761fba 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c @@ -1941,6 +1941,9 @@ static int qlge_send(struct sk_buff *skb, struct net_device *ndev) tx_ring = &qdev->tx_ring[tx_ring_idx]; + if (skb_padto(skb, ETH_ZLEN)) + return NETDEV_TX_OK; + if (unlikely(atomic_read(&tx_ring->tx_count) < 2)) { QPRINTK(qdev, TX_QUEUED, INFO, "%s: shutting down tx queue %d du to lack of resources.\n", |