Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f6881b8 authored by Li Yang's avatar Li Yang Committed by Jeff Garzik
Browse files

Revert "ucc_geth: returns NETDEV_TX_BUSY when BD ring is full" 



This reverts commit 18babd38.

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: default avatarMichael Barkowski <michael.barkowski@freescale.com>
Signed-off-by: default avatarLi Yang <leoli@freescale.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent e4d08359

drivers/net/ucc_geth.c

+1 −2
Original line number Diff line number Diff line
@@ -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)