hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
master
Felix Fietkau 2013-03-11 02:29:47 +00:00
parent dfe1972d62
commit 4b1c2fb15f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c
View File

@ -436,14 +436,20 @@ static void cns3xxx_adjust_link(struct net_device *dev)
dev->name, port->speed, port->duplex ? "full" : "half"); 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) irqreturn_t eth_rx_irq(int irq, void *pdev)
{ {
struct net_device *dev = pdev; struct net_device *dev = pdev;
struct sw *sw = netdev_priv(dev); struct sw *sw = netdev_priv(dev);
if (likely(napi_schedule_prep(&sw->napi))) { eth_schedule_poll(sw);
disable_irq_nosync(IRQ_CNS3XXX_SW_R0RXC);
__napi_schedule(&sw->napi);
}
return (IRQ_HANDLED); return (IRQ_HANDLED);
} }
@ -767,9 +773,8 @@ static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
skb_walk_frags(skb, skb1) skb_walk_frags(skb, skb1)
nr_desc++; nr_desc++;
eth_schedule_poll(sw);
spin_lock_bh(&tx_lock); spin_lock_bh(&tx_lock);
eth_complete_tx(sw);
if ((tx_ring->num_used + nr_desc + 1) >= TX_DESCS) { if ((tx_ring->num_used + nr_desc + 1) >= TX_DESCS) {
spin_unlock_bh(&tx_lock); spin_unlock_bh(&tx_lock);
return NETDEV_TX_BUSY; return NETDEV_TX_BUSY;