* [PATCH] Revert "ucc_geth: returns NETDEV_TX_BUSY when BD ring is full"
@ 2007-03-19 3:58 Li Yang
2007-03-23 5:50 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Li Yang @ 2007-03-19 3:58 UTC (permalink / raw)
To: jeff; +Cc: netdev, michael.barkowski
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 <michael.barkowski@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
---
Sorry for the mistake I made.
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 c2db49b..64e5bb4 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3609,7 +3609,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;
@@ -3625,7 +3624,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)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Revert "ucc_geth: returns NETDEV_TX_BUSY when BD ring is full"
2007-03-19 3:58 [PATCH] Revert "ucc_geth: returns NETDEV_TX_BUSY when BD ring is full" Li Yang
@ 2007-03-23 5:50 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2007-03-23 5:50 UTC (permalink / raw)
To: Li Yang; +Cc: netdev, michael.barkowski
Li Yang wrote:
> 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 <michael.barkowski@freescale.com>
> Signed-off-by: Li Yang <leoli@freescale.com>
> ---
> Sorry for the mistake I made.
>
> drivers/net/ucc_geth.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
applied
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-03-23 5:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-19 3:58 [PATCH] Revert "ucc_geth: returns NETDEV_TX_BUSY when BD ring is full" Li Yang
2007-03-23 5:50 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).