Philippe De Muyter wrote:
This patch
- avoids 7990 blocking when no tx buffer is available,
[...]
diff -r 6c0a10cc415a drivers/net/7990.c
--- a/drivers/net/7990.c Thu Jul 5 16:10:16 2007 -0700
+++ b/drivers/net/7990.c Fri Jul 6 11:27:20 2007 +0200
[...]
@@ -541,9 +546,6 @@ int lance_start_xmit (struct sk_buff *sk
static int outs;
unsigned long flags;
- if (!TX_BUFFS_AVAIL)
- return -1;
-
netif_stop_queue (dev);
skblen = skb->len;
@@ -565,9 +567,11 @@ int lance_start_xmit (struct sk_buff *sk
ib->btx_ring [entry].length = (-len) | 0xf000;
ib->btx_ring [entry].misc = 0;
- if (skb->len < ETH_ZLEN)
- memset((void *)&ib->tx_buf[entry][0], 0, ETH_ZLEN);
skb_copy_from_linear_data(skb, (void *)&ib->tx_buf[entry][0], skblen);
+ if (skblen < ETH_ZLEN)
+ memset((char *)&ib->tx_buf[entry][0] + skblen, 0, ETH_ZLEN -
skblen);
+
+ lp->stats.tx_bytes += skblen;
NAK
It "avoids" by removing an overrun check in hard_start_xmit that should
not be removed.
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
