ucc_geth: Fix BD processing
Subsystems (2)
PATCH 1/3 ucc_geth: Fix BD processing
Fix broken BD processing code.
---drivers/net/ucc_geth.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
drivers/net/ucc_geth.c +0 -0
@@ -3598,9 +3598,9 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* Move to next BD in the ring */ if (!(bd_status & T_W))
- ugeth->txBd[txQ] = bd + sizeof(struct qe_bd);
+ bd += sizeof(struct qe_bd);
else
- ugeth->txBd[txQ] = ugeth->p_tx_bd_ring[txQ];
+ bd = ugeth->p_tx_bd_ring[txQ];
/* If the next BD still needs to be cleaned up, then the bds are full. We need to tell the kernel to stop sending us stuff. */ @@ -3609,6 +3609,8 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) netif_stop_queue(dev); }
+ ugeth->txBd[txQ] = bd;
+
if (ugeth->p_scheduler) {
ugeth->cpucount[txQ]++;
/* Indicate to QE that there are more Tx bds ready for
@@ -3722,7 +3724,7 @@ 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]) && (netif_queue_stopped(dev) == 0))
+ if ((bd == ugeth->txBd[txQ]) && (netif_queue_stopped(dev) == 0))
break; ugeth->stats.tx_packets++;
@@ -3741,10 +3743,12 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ)
/* Advance the confirmation BD pointer */ if (!(bd_status & T_W))
- ugeth->confBd[txQ] += sizeof(struct qe_bd);
+ bd += sizeof(struct qe_bd);
else
- ugeth->confBd[txQ] = ugeth->p_tx_bd_ring[txQ];
+ bd = ugeth->p_tx_bd_ring[txQ];
+ bd_status = in_be32((u32 *)bd); } + ugeth->confBd[txQ] = bd; return 0; }
Quoted 8 lines · Li Yang
Fix broken BD processing code.
Signed-off-by Michael Barkowski <[email protected]>Signed-off-by Li Yang <[email protected]>---
drivers/net/ucc_geth.c| 14 +++++++++-----1 files changed, 9 insertions(+), 5 deletions(-)
applied 1-2 of 3
Quoted 11 lines
-----Original Message-----
From: Jeff Garzik [mailto:[email protected]]
Sent: Tuesday, March 06, 2007 7:11 PM
To: Li Yang-r58472
Cc: [email protected]
Subject: Re: [Patch 1/3]ucc_geth: Fix BD processingQuoted 2 lines · Li Yang
Fix broken BD processing code.
Quoted 8 lines
Quoted 6 lines
Signed-off-by Michael Barkowski <[email protected]>Signed-off-by Li Yang <[email protected]>---
drivers/net/ucc_geth.c| 14 +++++++++-----1 files changed, 9 insertions(+), 5 deletions(-)applied 1-2 of 3
Thanks. What's your comment about 3 of 3?
- Leo