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/8139cp.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/8139cp.c')
-rw-r--r-- | drivers/net/8139cp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index f6d9d1353dd5..dd7ac8290aec 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c | |||
@@ -604,7 +604,7 @@ rx_next: | |||
604 | 604 | ||
605 | spin_lock_irqsave(&cp->lock, flags); | 605 | spin_lock_irqsave(&cp->lock, flags); |
606 | cpw16_f(IntrMask, cp_intr_mask); | 606 | cpw16_f(IntrMask, cp_intr_mask); |
607 | __netif_rx_complete(dev, napi); | 607 | __netif_rx_complete(napi); |
608 | spin_unlock_irqrestore(&cp->lock, flags); | 608 | spin_unlock_irqrestore(&cp->lock, flags); |
609 | } | 609 | } |
610 | 610 | ||
@@ -641,9 +641,9 @@ static irqreturn_t cp_interrupt (int irq, void *dev_instance) | |||
641 | } | 641 | } |
642 | 642 | ||
643 | if (status & (RxOK | RxErr | RxEmpty | RxFIFOOvr)) | 643 | if (status & (RxOK | RxErr | RxEmpty | RxFIFOOvr)) |
644 | if (netif_rx_schedule_prep(dev, &cp->napi)) { | 644 | if (netif_rx_schedule_prep(&cp->napi)) { |
645 | cpw16_f(IntrMask, cp_norx_intr_mask); | 645 | cpw16_f(IntrMask, cp_norx_intr_mask); |
646 | __netif_rx_schedule(dev, &cp->napi); | 646 | __netif_rx_schedule(&cp->napi); |
647 | } | 647 | } |
648 | 648 | ||
649 | if (status & (TxOK | TxErr | TxEmpty | SWInt)) | 649 | if (status & (TxOK | TxErr | TxEmpty | SWInt)) |