From 500da140b2c5ea58979b49db429684240b31f9ba Mon Sep 17 00:00:00 2001 From: Ron Mercer Date: Wed, 11 Mar 2009 11:55:43 +0000 Subject: [PATCH] --- yaml --- r: 132395 b: refs/heads/master c: 855b0993f216a9b0f9cb33573bd05e314105d86c h: refs/heads/master i: 132393: f1fdeda7c9116d19ca6a41b09213c0d81a1df391 132391: c6b43bcd506133bafcd8b544bba305b1c67dc156 v: v3 --- [refs] | 2 +- trunk/drivers/net/qlge/qlge_main.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 827ba74a710b..6eeaf86851ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6612a6344aba8ba7b5af67cd006453bfedbb2967 +refs/heads/master: 855b0993f216a9b0f9cb33573bd05e314105d86c diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c index 00c37c0f8a90..91191f761fba 100644 --- a/trunk/drivers/net/qlge/qlge_main.c +++ b/trunk/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",