From e2f9ac67eef939514e9e5547c1b8cabc9a7fcd0b Mon Sep 17 00:00:00 2001 From: Ron Mercer Date: Mon, 9 Mar 2009 10:59:27 +0000 Subject: [PATCH] --- yaml --- r: 135125 b: refs/heads/master c: 74c50b4bae225b8e5aff9a1ceca256ba46c665c6 h: refs/heads/master i: 135123: c81d13a16123bcda34a8e957a03818e6d3c5f920 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 6425688aff0e..bf96615825e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b318cb36813d03dd20f80e63c37176a55edae30 +refs/heads/master: 74c50b4bae225b8e5aff9a1ceca256ba46c665c6 diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c index ce826da6f165..189584684aae 100644 --- a/trunk/drivers/net/qlge/qlge_main.c +++ b/trunk/drivers/net/qlge/qlge_main.c @@ -2057,6 +2057,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",