From: Li Yang <leoli@freescale.com>
Date: Tue, 6 Mar 2007 08:54:05 +0000 (+0800)
Subject: ucc_geth: returns NETDEV_TX_BUSY when BD ring is full
X-Git-Tag: v2.6.21-rc3~23^2~9
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=18babd38547a042a4bfd4154a014d1ad33373eb0;p=linux-2.6-omap-h63xx.git

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 <leoli@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 639e1e6913b..dab88b958d6 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)