ucc_geth: Fix full TX queue processing

commit 7583605b6d ("ucc_geth: Fix empty
TX queue processing") fixed empty TX queue mishandling, but didn't
account another corner case: when TX queue becomes full.

Without this patch the driver will stop transmiting when TX queue
becomes full since 'bd == ugeth->txBd[txQ]' actually checks for
two things: queue empty or full.

Let's better check for NULL skb, which unambiguously signals an empty
queue.

Signed-off-by: Jiajun Wu <[email protected]>
Signed-off-by: Anton Vorontsov <[email protected]>
Cc: Stable <[email protected]> [2.6.32]
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
Jiajun Wu 2010-01-18 05:47:50 +00:00 • committed by David S. Miller
commit 34692421bc

View file

@ -3279,13 +3279,12 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ)
/* Handle the transmitted buffer and release */
/* the BD to be used with the current frame */
if (bd == ugeth->txBd[txQ]) /* queue empty? */
skb = ugeth->tx_skbuff[txQ][ugeth->skb_dirtytx[txQ]];
if (!skb)
break;
dev->stats.tx_packets++;
skb = ugeth->tx_skbuff[txQ][ugeth->skb_dirtytx[txQ]];
if (skb_queue_len(&ugeth->rx_recycle) < RX_BD_RING_LEN &&
skb_recycle_check(skb,
ugeth->ug_info->uf_info.max_rx_buf_length +