ucc_geth: Fix BD processing

Fix broken BD processing code.

Signed-off-by: Michael Barkowski <michael.barkowski@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 885e73d731c2..639e1e6913bf 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -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;
 }