diff options
| author |   Intiyaz Basha <intiyaz.basha@cavium.com> | 2018-03-16 10:21:31 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-16 15:03:26 -0400 |
| commit | 5eb297a9a5aa5745b67ef1e7a399c0a7678d1d3f (patch) | |
| tree | 05d287039cc8ef6a2cad56cca11a018df6fdd28f /drivers/net/ethernet/cavium/liquidio/lio_core.c | |
| parent | Merge branch 'net-smc-IPv6-support' (diff) | |
| download | linux-dev-5eb297a9a5aa5745b67ef1e7a399c0a7678d1d3f.tar.xz linux-dev-5eb297a9a5aa5745b67ef1e7a399c0a7678d1d3f.zip | |
liquidio: Simplified napi poll
1) Moved interrupt enable related code from octeon_process_droq_poll_cmd()
to separate function octeon_enable_irq().
2) Removed wrapper function octeon_process_droq_poll_cmd(), and directlyi
using octeon_droq_process_poll_pkts().
3) Removed unused macros POLL_EVENT_XXX.
Signed-off-by: Intiyaz Basha <intiyaz.basha@cavium.com>
Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/liquidio/lio_core.c')
| -rw-r--r-- | drivers/net/ethernet/cavium/liquidio/lio_core.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c index e7b6eb87ab14..666cf7e9cd09 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_core.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_core.c @@ -627,9 +627,7 @@ static int liquidio_napi_poll(struct napi_struct *napi, int budget) iq_no = droq->q_no; /* Handle Droq descriptors */ - work_done = octeon_process_droq_poll_cmd(oct, droq->q_no, - POLL_EVENT_PROCESS_PKTS, - budget); + work_done = octeon_droq_process_poll_pkts(oct, droq, budget); /* Flush the instruction queue */ iq = oct->instr_queue[iq_no]; @@ -660,8 +658,7 @@ static int liquidio_napi_poll(struct napi_struct *napi, int budget) tx_done = 1; napi_complete_done(napi, work_done); - octeon_process_droq_poll_cmd(droq->oct_dev, droq->q_no, - POLL_EVENT_ENABLE_INTR, 0); + octeon_enable_irq(droq->oct_dev, droq->q_no); return 0; } |