diff options
author | Ron Mercer <ron.mercer@qlogic.com> | 2009-03-09 06:59:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-10 07:43:58 -0400 |
commit | 74c50b4bae225b8e5aff9a1ceca256ba46c665c6 (patch) | |
tree | 396c3c21b6aff97055691bbbeddf442b5c4a965a /drivers/net/qlge | |
parent | 6b318cb36813d03dd20f80e63c37176a55edae30 (diff) |
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>
Diffstat (limited to 'drivers/net/qlge')
-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 ce826da6f165..189584684aae 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
@@ -2057,6 +2057,9 @@ static int qlge_send(struct sk_buff *skb, struct net_device *ndev) | |||
2057 | 2057 | ||
2058 | tx_ring = &qdev->tx_ring[tx_ring_idx]; | 2058 | tx_ring = &qdev->tx_ring[tx_ring_idx]; |
2059 | 2059 | ||
2060 | if (skb_padto(skb, ETH_ZLEN)) | ||
2061 | return NETDEV_TX_OK; | ||
2062 | |||
2060 | if (unlikely(atomic_read(&tx_ring->tx_count) < 2)) { | 2063 | if (unlikely(atomic_read(&tx_ring->tx_count) < 2)) { |
2061 | QPRINTK(qdev, TX_QUEUED, INFO, | 2064 | QPRINTK(qdev, TX_QUEUED, INFO, |
2062 | "%s: shutting down tx queue %d du to lack of resources.\n", | 2065 | "%s: shutting down tx queue %d du to lack of resources.\n", |