Revert "ucc_geth: returns NETDEV_TX_BUSY when BD ring is full"
Subsystems (2)
PATCH 1/1 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.
---
Sorry for the mistake I made.
drivers/net/ucc_geth.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
drivers/net/ucc_geth.c +0 -0
@@ -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)
Jeff Garzik
AppliedQuoted 8 lines · Li Yang
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.
Quoted 7 lines
Reported-by Michael Barkowski <[email protected]>Signed-off-by Li Yang <[email protected]>---
Sorry for the mistake I made.
drivers/net/ucc_geth.c| 3 +--1 files changed, 1 insertions(+), 2 deletions(-)
applied