Commit:     6f6881b846e3d97ee15f6ab1f6529cd1cc2f4c28
Parent:     e4d08359ffb6580ee7a014d162162b2d18aa4ec0
Author:     Li Yang <[EMAIL PROTECTED]>
AuthorDate: Mon Mar 19 11:58:02 2007 +0800
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Fri Mar 23 01:48:34 2007 -0400

    Revert "ucc_geth: returns NETDEV_TX_BUSY when BD ring is full"
    This reverts commit 18babd38547a042a4bfd4154a014d1ad33373eb0.
    Michael Barkowski points out that it's wrong, and I agree.  The
    patch causes a problem rather than fixes one after another
    patch "ucc_geth: Fix BD processing" was applied.  Before that
    patch, current packet should be blocked.  However after the patch
    current packet is ok and we only need to block next.
    Reported-by: Michael Barkowski <[EMAIL PROTECTED]>
    Signed-off-by: Li Yang <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
 drivers/net/ucc_geth.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index dab88b9..639e1e6 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3607,7 +3607,6 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, 
struct net_device *dev)
        if (bd == ugeth->confBd[txQ]) {
                if (!netif_queue_stopped(dev))
-               return NETDEV_TX_BUSY;
        ugeth->txBd[txQ] = bd;
@@ -3623,7 +3622,7 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, 
struct net_device *dev)
-       return NETDEV_TX_OK;
+       return 0;
 static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int 
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to