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/tc35815.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/tc35815.c')
-rw-r--r-- | drivers/net/tc35815.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index 308f365270e9..bcd0e60cbda9 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c | |||
@@ -1609,8 +1609,8 @@ static irqreturn_t tc35815_interrupt(int irq, void *dev_id) | |||
1609 | if (!(dmactl & DMA_IntMask)) { | 1609 | if (!(dmactl & DMA_IntMask)) { |
1610 | /* disable interrupts */ | 1610 | /* disable interrupts */ |
1611 | tc_writel(dmactl | DMA_IntMask, &tr->DMA_Ctl); | 1611 | tc_writel(dmactl | DMA_IntMask, &tr->DMA_Ctl); |
1612 | if (netif_rx_schedule_prep(dev, &lp->napi)) | 1612 | if (netif_rx_schedule_prep(&lp->napi)) |
1613 | __netif_rx_schedule(dev, &lp->napi); | 1613 | __netif_rx_schedule(&lp->napi); |
1614 | else { | 1614 | else { |
1615 | printk(KERN_ERR "%s: interrupt taken in poll\n", | 1615 | printk(KERN_ERR "%s: interrupt taken in poll\n", |
1616 | dev->name); | 1616 | dev->name); |
@@ -1919,7 +1919,7 @@ static int tc35815_poll(struct napi_struct *napi, int budget) | |||
1919 | spin_unlock(&lp->lock); | 1919 | spin_unlock(&lp->lock); |
1920 | 1920 | ||
1921 | if (received < budget) { | 1921 | if (received < budget) { |
1922 | netif_rx_complete(dev, napi); | 1922 | netif_rx_complete(napi); |
1923 | /* enable interrupts */ | 1923 | /* enable interrupts */ |
1924 | tc_writel(tc_readl(&tr->DMA_Ctl) & ~DMA_IntMask, &tr->DMA_Ctl); | 1924 | tc_writel(tc_readl(&tr->DMA_Ctl) & ~DMA_IntMask, &tr->DMA_Ctl); |
1925 | } | 1925 | } |