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/xen-netfront.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/xen-netfront.c')
-rw-r--r-- | drivers/net/xen-netfront.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index fe376fde4e89..761635be9104 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
@@ -196,7 +196,7 @@ static void rx_refill_timeout(unsigned long data) | |||
196 | { | 196 | { |
197 | struct net_device *dev = (struct net_device *)data; | 197 | struct net_device *dev = (struct net_device *)data; |
198 | struct netfront_info *np = netdev_priv(dev); | 198 | struct netfront_info *np = netdev_priv(dev); |
199 | netif_rx_schedule(dev, &np->napi); | 199 | netif_rx_schedule(&np->napi); |
200 | } | 200 | } |
201 | 201 | ||
202 | static int netfront_tx_slot_available(struct netfront_info *np) | 202 | static int netfront_tx_slot_available(struct netfront_info *np) |
@@ -328,7 +328,7 @@ static int xennet_open(struct net_device *dev) | |||
328 | xennet_alloc_rx_buffers(dev); | 328 | xennet_alloc_rx_buffers(dev); |
329 | np->rx.sring->rsp_event = np->rx.rsp_cons + 1; | 329 | np->rx.sring->rsp_event = np->rx.rsp_cons + 1; |
330 | if (RING_HAS_UNCONSUMED_RESPONSES(&np->rx)) | 330 | if (RING_HAS_UNCONSUMED_RESPONSES(&np->rx)) |
331 | netif_rx_schedule(dev, &np->napi); | 331 | netif_rx_schedule(&np->napi); |
332 | } | 332 | } |
333 | spin_unlock_bh(&np->rx_lock); | 333 | spin_unlock_bh(&np->rx_lock); |
334 | 334 | ||
@@ -979,7 +979,7 @@ err: | |||
979 | 979 | ||
980 | RING_FINAL_CHECK_FOR_RESPONSES(&np->rx, more_to_do); | 980 | RING_FINAL_CHECK_FOR_RESPONSES(&np->rx, more_to_do); |
981 | if (!more_to_do) | 981 | if (!more_to_do) |
982 | __netif_rx_complete(dev, napi); | 982 | __netif_rx_complete(napi); |
983 | 983 | ||
984 | local_irq_restore(flags); | 984 | local_irq_restore(flags); |
985 | } | 985 | } |
@@ -1310,7 +1310,7 @@ static irqreturn_t xennet_interrupt(int irq, void *dev_id) | |||
1310 | xennet_tx_buf_gc(dev); | 1310 | xennet_tx_buf_gc(dev); |
1311 | /* Under tx_lock: protects access to rx shared-ring indexes. */ | 1311 | /* Under tx_lock: protects access to rx shared-ring indexes. */ |
1312 | if (RING_HAS_UNCONSUMED_RESPONSES(&np->rx)) | 1312 | if (RING_HAS_UNCONSUMED_RESPONSES(&np->rx)) |
1313 | netif_rx_schedule(dev, &np->napi); | 1313 | netif_rx_schedule(&np->napi); |
1314 | } | 1314 | } |
1315 | 1315 | ||
1316 | spin_unlock_irqrestore(&np->tx_lock, flags); | 1316 | spin_unlock_irqrestore(&np->tx_lock, flags); |