aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx/files/drivers/net
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-03-11 02:29:53 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-03-11 02:29:53 +0000
commitbd6c9d6252914dde962d00773ad657da409dc800 (patch)
treeaf7581ab942a4f732da499de607e1cf98f77892d /target/linux/cns3xxx/files/drivers/net
parentd7a529709a9fe2ccfe079fb7669f4e8cd98a5fd5 (diff)
downloadupstream-bd6c9d6252914dde962d00773ad657da409dc800.tar.gz
upstream-bd6c9d6252914dde962d00773ad657da409dc800.tar.bz2
upstream-bd6c9d6252914dde962d00773ad657da409dc800.zip
cns3xxx: ethernet - clean the tx ring before refilling the rx ring to reduce memory pressure
SVN-Revision: 35953
Diffstat (limited to 'target/linux/cns3xxx/files/drivers/net')
-rw-r--r--target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c8
1 files changed, 4 insertions, 4 deletions
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 9c3618fd9b..db15a2e2e5 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
@@ -718,6 +718,10 @@ static int eth_poll(struct napi_struct *napi, int budget)
enable_irq(IRQ_CNS3XXX_SW_R0RXC);
}
+ spin_lock_bh(&tx_lock);
+ eth_complete_tx(sw);
+ spin_unlock_bh(&tx_lock);
+
cns3xxx_alloc_rx_buf(sw, received);
rx_ring->cur_index = i;
@@ -725,10 +729,6 @@ static int eth_poll(struct napi_struct *napi, int budget)
wmb();
enable_rx_dma(sw);
- spin_lock_bh(&tx_lock);
- eth_complete_tx(sw);
- spin_unlock_bh(&tx_lock);
-
return received;
}