diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-09-11 23:37:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-11 23:37:06 -0700 |
| commit | 82bcee42059f6117fc36046d1587d7850415a31a (patch) | |
| tree | aa8b51a9b10f043818a11db9756f05c05f83e459 /drivers/net/ethernet/cavium/liquidio/octeon_device.c | |
| parent | xen-netback: remove unecessary condition check before debugfs_remove_recursive (diff) | |
| parent | liquidio: Removed droq lock (diff) | |
| download | linux-dev-82bcee42059f6117fc36046d1587d7850415a31a.tar.xz linux-dev-82bcee42059f6117fc36046d1587d7850415a31a.zip | |
Merge branch 'liquidio-Removed-droq-lock-from-Rx-path'
Intiyaz Basha says:
====================
liquidio: Removed droq lock from Rx path
Series of patches for removing droq lock from Rx Path.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/liquidio/octeon_device.c')
| -rw-r--r-- | drivers/net/ethernet/cavium/liquidio/octeon_device.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.c b/drivers/net/ethernet/cavium/liquidio/octeon_device.c index d0ed6c4f9e1a..0f0275cd153e 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_device.c +++ b/drivers/net/ethernet/cavium/liquidio/octeon_device.c @@ -1440,12 +1440,8 @@ void lio_enable_irq(struct octeon_droq *droq, struct octeon_instr_queue *iq) /* the whole thing needs to be atomic, ideally */ if (droq) { pkts_pend = (u32)atomic_read(&droq->pkts_pending); - spin_lock_bh(&droq->lock); writel(droq->pkt_count - pkts_pend, droq->pkts_sent_reg); droq->pkt_count = pkts_pend; - /* this write needs to be flushed before we release the lock */ - mmiowb(); - spin_unlock_bh(&droq->lock); oct = droq->oct_dev; } if (iq) { |