diff options
author | Neil Horman <nhorman@tuxdriver.com> | 2008-12-22 23:43:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-22 23:43:12 -0500 |
commit | 908a7a16b852ffd618a9127be8d62432182d81b4 (patch) | |
tree | a0b509227e26bef7edd347575761e0dbeb5756e7 /drivers/net/cassini.c | |
parent | 889bd9b6dbcd426b8698c4a779dd7dbf247f57b8 (diff) |
net: Remove unused netdev arg from some NAPI interfaces.
When the napi api was changed to separate its 1:1 binding to the net_device
struct, the netif_rx_[prep|schedule|complete] api failed to remove the now
vestigual net_device structure parameter. This patch cleans up that api by
properly removing it..
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cassini.c')
-rw-r--r-- | drivers/net/cassini.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c index 023d205e9054..321f43d9f0e2 100644 --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c | |||
@@ -2506,7 +2506,7 @@ static irqreturn_t cas_interruptN(int irq, void *dev_id) | |||
2506 | if (status & INTR_RX_DONE_ALT) { /* handle rx separately */ | 2506 | if (status & INTR_RX_DONE_ALT) { /* handle rx separately */ |
2507 | #ifdef USE_NAPI | 2507 | #ifdef USE_NAPI |
2508 | cas_mask_intr(cp); | 2508 | cas_mask_intr(cp); |
2509 | netif_rx_schedule(dev, &cp->napi); | 2509 | netif_rx_schedule(&cp->napi); |
2510 | #else | 2510 | #else |
2511 | cas_rx_ringN(cp, ring, 0); | 2511 | cas_rx_ringN(cp, ring, 0); |
2512 | #endif | 2512 | #endif |
@@ -2557,7 +2557,7 @@ static irqreturn_t cas_interrupt1(int irq, void *dev_id) | |||
2557 | if (status & INTR_RX_DONE_ALT) { /* handle rx separately */ | 2557 | if (status & INTR_RX_DONE_ALT) { /* handle rx separately */ |
2558 | #ifdef USE_NAPI | 2558 | #ifdef USE_NAPI |
2559 | cas_mask_intr(cp); | 2559 | cas_mask_intr(cp); |
2560 | netif_rx_schedule(dev, &cp->napi); | 2560 | netif_rx_schedule(&cp->napi); |
2561 | #else | 2561 | #else |
2562 | cas_rx_ringN(cp, 1, 0); | 2562 | cas_rx_ringN(cp, 1, 0); |
2563 | #endif | 2563 | #endif |
@@ -2613,7 +2613,7 @@ static irqreturn_t cas_interrupt(int irq, void *dev_id) | |||
2613 | if (status & INTR_RX_DONE) { | 2613 | if (status & INTR_RX_DONE) { |
2614 | #ifdef USE_NAPI | 2614 | #ifdef USE_NAPI |
2615 | cas_mask_intr(cp); | 2615 | cas_mask_intr(cp); |
2616 | netif_rx_schedule(dev, &cp->napi); | 2616 | netif_rx_schedule(&cp->napi); |
2617 | #else | 2617 | #else |
2618 | cas_rx_ringN(cp, 0, 0); | 2618 | cas_rx_ringN(cp, 0, 0); |
2619 | #endif | 2619 | #endif |
@@ -2691,7 +2691,7 @@ rx_comp: | |||
2691 | #endif | 2691 | #endif |
2692 | spin_unlock_irqrestore(&cp->lock, flags); | 2692 | spin_unlock_irqrestore(&cp->lock, flags); |
2693 | if (enable_intr) { | 2693 | if (enable_intr) { |
2694 | netif_rx_complete(dev, napi); | 2694 | netif_rx_complete(napi); |
2695 | cas_unmask_intr(cp); | 2695 | cas_unmask_intr(cp); |
2696 | } | 2696 | } |
2697 | return credits; | 2697 | return credits; |