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/b44.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/b44.c')
-rw-r--r-- | drivers/net/b44.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 2c7a32eb92a5..934a95091dc3 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
@@ -875,7 +875,7 @@ static int b44_poll(struct napi_struct *napi, int budget) | |||
875 | } | 875 | } |
876 | 876 | ||
877 | if (work_done < budget) { | 877 | if (work_done < budget) { |
878 | netif_rx_complete(netdev, napi); | 878 | netif_rx_complete(napi); |
879 | b44_enable_ints(bp); | 879 | b44_enable_ints(bp); |
880 | } | 880 | } |
881 | 881 | ||
@@ -907,13 +907,13 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id) | |||
907 | goto irq_ack; | 907 | goto irq_ack; |
908 | } | 908 | } |
909 | 909 | ||
910 | if (netif_rx_schedule_prep(dev, &bp->napi)) { | 910 | if (netif_rx_schedule_prep(&bp->napi)) { |
911 | /* NOTE: These writes are posted by the readback of | 911 | /* NOTE: These writes are posted by the readback of |
912 | * the ISTAT register below. | 912 | * the ISTAT register below. |
913 | */ | 913 | */ |
914 | bp->istat = istat; | 914 | bp->istat = istat; |
915 | __b44_disable_ints(bp); | 915 | __b44_disable_ints(bp); |
916 | __netif_rx_schedule(dev, &bp->napi); | 916 | __netif_rx_schedule(&bp->napi); |
917 | } else { | 917 | } else { |
918 | printk(KERN_ERR PFX "%s: Error, poll already scheduled\n", | 918 | printk(KERN_ERR PFX "%s: Error, poll already scheduled\n", |
919 | dev->name); | 919 | dev->name); |