[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4693B615.6010605@garzik.org>
Date: Tue, 10 Jul 2007 12:38:45 -0400
From: Jeff Garzik <jeff@...zik.org>
To: Philippe De Muyter <phdm@...qel.be>
CC: netdev@...r.kernel.org
Subject: Re: [PATCH] 7990 : Various fixes and cleanups
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 majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists