From 9c312dc5a352a863bac6f5db68b14d28592d00e4 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 11 Mar 2013 02:29:47 +0000 Subject: cns3xxx: ethernet - clean the tx ring only in the poll function, not in the xmit handler git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35952 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../files/drivers/net/ethernet/cavium/cns3xxx_eth.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'target') 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 7166288b5..9c3618fd9 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; -- cgit v1.2.3