redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] sky2: transmit logic fixes 

Some transmit side small fixes:
 * When computing number of list elements per transmit, do full
   comparision to check for checksuming.
 * Get rid of racy check for tx_complete
 * Change stop test to match wake condition.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
hifive-unleashed-5.1
Stephen Hemminger 2005-12-09 11:35:02 -08:00 committed by Jeff Garzik
parent 6cdbbdf305
commit 0e3ff6aab1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/sky2.c
View File

@ -1051,7 +1051,7 @@ static inline unsigned tx_le_req(const struct sk_buff *skb)
if (skb_shinfo(skb)->tso_size)
++count;
if (skb->ip_summed)
if (skb->ip_summed == CHECKSUM_HW)
++count;
return count;
@ -1207,7 +1207,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod,
&sky2->tx_last_put, TX_RING_SIZE);
if (tx_avail(sky2) < MAX_SKB_TX_LE + 1)
if (tx_avail(sky2) <= MAX_SKB_TX_LE)
netif_stop_queue(dev);
out_unlock:
@ -1229,8 +1229,7 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done)
struct net_device *dev = sky2->netdev;
unsigned i;
if (done == sky2->tx_cons)
return;
BUG_ON(done >= TX_RING_SIZE);
if (unlikely(netif_msg_tx_done(sky2)))
printk(KERN_DEBUG "%s: tx done, up to %u\n",