Revert "ucc_geth: returns NETDEV_TX_BUSY when BD ring is full"
This reverts commit 18babd3854
.
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>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Родитель
e4d08359ff
Коммит
6f6881b846
|
@ -3607,7 +3607,6 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||||
if (bd == ugeth->confBd[txQ]) {
|
if (bd == ugeth->confBd[txQ]) {
|
||||||
if (!netif_queue_stopped(dev))
|
if (!netif_queue_stopped(dev))
|
||||||
netif_stop_queue(dev);
|
netif_stop_queue(dev);
|
||||||
return NETDEV_TX_BUSY;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ugeth->txBd[txQ] = bd;
|
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);
|
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)
|
static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче