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/forcedeth.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/forcedeth.c')
-rw-r--r-- | drivers/net/forcedeth.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 1f2b24743ee9..9fbfa856ae5b 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -1760,7 +1760,7 @@ static void nv_do_rx_refill(unsigned long data) | |||
1760 | struct fe_priv *np = netdev_priv(dev); | 1760 | struct fe_priv *np = netdev_priv(dev); |
1761 | 1761 | ||
1762 | /* Just reschedule NAPI rx processing */ | 1762 | /* Just reschedule NAPI rx processing */ |
1763 | netif_rx_schedule(dev, &np->napi); | 1763 | netif_rx_schedule(&np->napi); |
1764 | } | 1764 | } |
1765 | #else | 1765 | #else |
1766 | static void nv_do_rx_refill(unsigned long data) | 1766 | static void nv_do_rx_refill(unsigned long data) |
@@ -3403,7 +3403,7 @@ static irqreturn_t nv_nic_irq(int foo, void *data) | |||
3403 | 3403 | ||
3404 | #ifdef CONFIG_FORCEDETH_NAPI | 3404 | #ifdef CONFIG_FORCEDETH_NAPI |
3405 | if (events & NVREG_IRQ_RX_ALL) { | 3405 | if (events & NVREG_IRQ_RX_ALL) { |
3406 | netif_rx_schedule(dev, &np->napi); | 3406 | netif_rx_schedule(&np->napi); |
3407 | 3407 | ||
3408 | /* Disable furthur receive irq's */ | 3408 | /* Disable furthur receive irq's */ |
3409 | spin_lock(&np->lock); | 3409 | spin_lock(&np->lock); |
@@ -3520,7 +3520,7 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data) | |||
3520 | 3520 | ||
3521 | #ifdef CONFIG_FORCEDETH_NAPI | 3521 | #ifdef CONFIG_FORCEDETH_NAPI |
3522 | if (events & NVREG_IRQ_RX_ALL) { | 3522 | if (events & NVREG_IRQ_RX_ALL) { |
3523 | netif_rx_schedule(dev, &np->napi); | 3523 | netif_rx_schedule(&np->napi); |
3524 | 3524 | ||
3525 | /* Disable furthur receive irq's */ | 3525 | /* Disable furthur receive irq's */ |
3526 | spin_lock(&np->lock); | 3526 | spin_lock(&np->lock); |
@@ -3678,7 +3678,7 @@ static int nv_napi_poll(struct napi_struct *napi, int budget) | |||
3678 | /* re-enable receive interrupts */ | 3678 | /* re-enable receive interrupts */ |
3679 | spin_lock_irqsave(&np->lock, flags); | 3679 | spin_lock_irqsave(&np->lock, flags); |
3680 | 3680 | ||
3681 | __netif_rx_complete(dev, napi); | 3681 | __netif_rx_complete(napi); |
3682 | 3682 | ||
3683 | np->irqmask |= NVREG_IRQ_RX_ALL; | 3683 | np->irqmask |= NVREG_IRQ_RX_ALL; |
3684 | if (np->msi_flags & NV_MSI_X_ENABLED) | 3684 | if (np->msi_flags & NV_MSI_X_ENABLED) |
@@ -3704,7 +3704,7 @@ static irqreturn_t nv_nic_irq_rx(int foo, void *data) | |||
3704 | writel(NVREG_IRQ_RX_ALL, base + NvRegMSIXIrqStatus); | 3704 | writel(NVREG_IRQ_RX_ALL, base + NvRegMSIXIrqStatus); |
3705 | 3705 | ||
3706 | if (events) { | 3706 | if (events) { |
3707 | netif_rx_schedule(dev, &np->napi); | 3707 | netif_rx_schedule(&np->napi); |
3708 | /* disable receive interrupts on the nic */ | 3708 | /* disable receive interrupts on the nic */ |
3709 | writel(NVREG_IRQ_RX_ALL, base + NvRegIrqMask); | 3709 | writel(NVREG_IRQ_RX_ALL, base + NvRegIrqMask); |
3710 | pci_push(base); | 3710 | pci_push(base); |