From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 11 Mar 2013 02:29:47 +0000 (+0000)
Subject: cns3xxx: ethernet - clean the tx ring only in the poll function, not in the xmit... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=c899dbc1b6d179acfda68679ff90e9d448d6028d

cns3xxx: ethernet - clean the tx ring only in the poll function, not in the xmit handler

SVN-Revision: 35952
---

diff --git a/target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c b/target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c
index 7166288b55..9c3618fd9b 100644
--- a/target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c
+++ b/target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c
@@ -436,14 +436,20 @@ static void cns3xxx_adjust_link(struct net_device *dev)
 	       dev->name, port->speed, port->duplex ? "full" : "half");
 }
 
+static void eth_schedule_poll(struct sw *sw)
+{
+	if (unlikely(!napi_schedule_prep(&sw->napi)))
+		return;
+
+	disable_irq_nosync(IRQ_CNS3XXX_SW_R0RXC);
+	__napi_schedule(&sw->napi);
+}
+
 irqreturn_t eth_rx_irq(int irq, void *pdev)
 {
 	struct net_device *dev = pdev;
 	struct sw *sw = netdev_priv(dev);
-	if (likely(napi_schedule_prep(&sw->napi))) {
-		disable_irq_nosync(IRQ_CNS3XXX_SW_R0RXC);
-		__napi_schedule(&sw->napi);
-	}
+	eth_schedule_poll(sw);
 	return (IRQ_HANDLED);
 }
 
@@ -767,9 +773,8 @@ static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
 	skb_walk_frags(skb, skb1)
 		nr_desc++;
 
+	eth_schedule_poll(sw);
 	spin_lock_bh(&tx_lock);
-
-	eth_complete_tx(sw);
 	if ((tx_ring->num_used + nr_desc + 1) >= TX_DESCS) {
 		spin_unlock_bh(&tx_lock);
 		return NETDEV_TX_BUSY;