diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2016-08-31 23:57:38 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-02 14:46:53 +0200 |
| commit | 08712f9de1013ed360d489fc185d962dfd6be7cf (patch) | |
| tree | 618af54633a5a186f711c80079718194bfe39970 /drivers/staging/octeon | |
| parent | 513ff86386f6ba2ea5769f1ab3383036ab53d9f0 (diff) | |
| download | linux-08712f9de1013ed360d489fc185d962dfd6be7cf.tar.bz2 | |
staging: octeon: pass the NAPI instance reference to irq handler
Pass the NAPI instance reference to the interrupt handler.
This is preparation for having multiple NAPI instances.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/octeon')
| -rw-r--r-- | drivers/staging/octeon/ethernet-rx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c index 808c4155f046..27e3459a626e 100644 --- a/drivers/staging/octeon/ethernet-rx.c +++ b/drivers/staging/octeon/ethernet-rx.c @@ -48,16 +48,16 @@ static struct napi_struct cvm_oct_napi; /** * cvm_oct_do_interrupt - interrupt handler. * @irq: Interrupt number. - * @dev_id: Cookie to identify the device. Unused + * @napi_id: Cookie to identify the NAPI instance. * * The interrupt occurs whenever the POW has packets in our group. * */ -static irqreturn_t cvm_oct_do_interrupt(int irq, void *dev_id) +static irqreturn_t cvm_oct_do_interrupt(int irq, void *napi_id) { /* Disable the IRQ and start napi_poll. */ disable_irq_nosync(irq); - napi_schedule(&cvm_oct_napi); + napi_schedule(napi_id); return IRQ_HANDLED; } @@ -452,7 +452,7 @@ void cvm_oct_rx_initialize(void) /* Register an IRQ handler to receive POW interrupts */ i = request_irq(OCTEON_IRQ_WORKQ0 + pow_receive_group, - cvm_oct_do_interrupt, 0, "Ethernet", cvm_oct_device); + cvm_oct_do_interrupt, 0, "Ethernet", &cvm_oct_napi); if (i) panic("Could not acquire Ethernet IRQ %d\n", |