Revert ucc_geth: returns NETDEV_TX_BUSY when BD ring is full

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6f6881b846e3d97ee15f6ab1f6529cd1cc2f4c28
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))
netif_stop_queue(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)
 
spin_unlock_irq(ugeth-lock);
 
-   return NETDEV_TX_OK;
+   return 0;
 }
 
 static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int 
rx_work_limit)
-
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  http://vger.kernel.org/majordomo-info.html

ucc_geth: returns NETDEV_TX_BUSY when BD ring is full

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=18babd38547a042a4bfd4154a014d1ad33373eb0
Commit: 18babd38547a042a4bfd4154a014d1ad33373eb0
Parent: a394f013f05ba083d8547551280e0309ca70b08d
Author: Li Yang [EMAIL PROTECTED]
AuthorDate: Tue Mar 6 16:54:05 2007 +0800
Committer:  Jeff Garzik [EMAIL PROTECTED]
CommitDate: Tue Mar 6 06:10:02 2007 -0500

ucc_geth: returns NETDEV_TX_BUSY when BD ring is full

Returns NETDEV_TX_BUSY when BD ring is full.

Signed-off-by: Li Yang [EMAIL PROTECTED]
Signed-off-by: Jeff Garzik [EMAIL PROTECTED]
---
 drivers/net/ucc_geth.c |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 639e1e6..dab88b9 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3607,6 +3607,7 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, 
struct net_device *dev)
if (bd == ugeth-confBd[txQ]) {
if (!netif_queue_stopped(dev))
netif_stop_queue(dev);
+   return NETDEV_TX_BUSY;
}
 
ugeth-txBd[txQ] = bd;
@@ -3622,7 +3623,7 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, 
struct net_device *dev)
 
spin_unlock_irq(ugeth-lock);
 
-   return 0;
+   return NETDEV_TX_OK;
 }
 
 static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int 
rx_work_limit)
-
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  http://vger.kernel.org/majordomo-info.html