diff options
| author | Neil Horman <nhorman@tuxdriver.com> | 2008-12-22 20:43:12 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-22 20:43:12 -0800 |
| commit | 908a7a16b852ffd618a9127be8d62432182d81b4 (patch) | |
| tree | a0b509227e26bef7edd347575761e0dbeb5756e7 /drivers/net/ixp2000 | |
| parent | 889bd9b6dbcd426b8698c4a779dd7dbf247f57b8 (diff) | |
| download | kernel-crypto-908a7a16b852ffd618a9127be8d62432182d81b4.tar.gz kernel-crypto-908a7a16b852ffd618a9127be8d62432182d81b4.tar.xz kernel-crypto-908a7a16b852ffd618a9127be8d62432182d81b4.zip | |
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/ixp2000')
| -rw-r--r-- | drivers/net/ixp2000/ixpdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c index bd96dbc8e02..01474572056 100644 --- a/drivers/net/ixp2000/ixpdev.c +++ b/drivers/net/ixp2000/ixpdev.c @@ -141,7 +141,7 @@ static int ixpdev_poll(struct napi_struct *napi, int budget) break; } while (ixp2000_reg_read(IXP2000_IRQ_THD_RAW_STATUS_A_0) & 0x00ff); - netif_rx_complete(dev, napi); + netif_rx_complete(napi); ixp2000_reg_write(IXP2000_IRQ_THD_ENABLE_SET_A_0, 0x00ff); return rx; @@ -204,7 +204,7 @@ static irqreturn_t ixpdev_interrupt(int irq, void *dev_id) ixp2000_reg_wrb(IXP2000_IRQ_THD_ENABLE_CLEAR_A_0, 0x00ff); if (likely(napi_schedule_prep(&ip->napi))) { - __netif_rx_schedule(dev, &ip->napi); + __netif_rx_schedule(&ip->napi); } else { printk(KERN_CRIT "ixp2000: irq while polling!!\n"); } |