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/8139too.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/8139too.c')
-rw-r--r-- | drivers/net/8139too.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index 67bbf4f25bea..fe370f805793 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
@@ -2128,7 +2128,7 @@ static int rtl8139_poll(struct napi_struct *napi, int budget) | |||
2128 | */ | 2128 | */ |
2129 | spin_lock_irqsave(&tp->lock, flags); | 2129 | spin_lock_irqsave(&tp->lock, flags); |
2130 | RTL_W16_F(IntrMask, rtl8139_intr_mask); | 2130 | RTL_W16_F(IntrMask, rtl8139_intr_mask); |
2131 | __netif_rx_complete(dev, napi); | 2131 | __netif_rx_complete(napi); |
2132 | spin_unlock_irqrestore(&tp->lock, flags); | 2132 | spin_unlock_irqrestore(&tp->lock, flags); |
2133 | } | 2133 | } |
2134 | spin_unlock(&tp->rx_lock); | 2134 | spin_unlock(&tp->rx_lock); |
@@ -2178,9 +2178,9 @@ static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance) | |||
2178 | /* Receive packets are processed by poll routine. | 2178 | /* Receive packets are processed by poll routine. |
2179 | If not running start it now. */ | 2179 | If not running start it now. */ |
2180 | if (status & RxAckBits){ | 2180 | if (status & RxAckBits){ |
2181 | if (netif_rx_schedule_prep(dev, &tp->napi)) { | 2181 | if (netif_rx_schedule_prep(&tp->napi)) { |
2182 | RTL_W16_F (IntrMask, rtl8139_norx_intr_mask); | 2182 | RTL_W16_F (IntrMask, rtl8139_norx_intr_mask); |
2183 | __netif_rx_schedule(dev, &tp->napi); | 2183 | __netif_rx_schedule(&tp->napi); |
2184 | } | 2184 | } |
2185 | } | 2185 | } |
2186 | 2186 | ||