diff options
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 cd6184ee08ee..9f102a6535c4 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(&np->napi); | 199 | napi_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(&np->napi); | 331 | napi_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(napi); | 982 | __napi_complete(napi); |
983 | 983 | ||
984 | local_irq_restore(flags); | 984 | local_irq_restore(flags); |
985 | } | 985 | } |
@@ -1317,7 +1317,7 @@ static irqreturn_t xennet_interrupt(int irq, void *dev_id) | |||
1317 | xennet_tx_buf_gc(dev); | 1317 | xennet_tx_buf_gc(dev); |
1318 | /* Under tx_lock: protects access to rx shared-ring indexes. */ | 1318 | /* Under tx_lock: protects access to rx shared-ring indexes. */ |
1319 | if (RING_HAS_UNCONSUMED_RESPONSES(&np->rx)) | 1319 | if (RING_HAS_UNCONSUMED_RESPONSES(&np->rx)) |
1320 | netif_rx_schedule(&np->napi); | 1320 | napi_schedule(&np->napi); |
1321 | } | 1321 | } |
1322 | 1322 | ||
1323 | spin_unlock_irqrestore(&np->tx_lock, flags); | 1323 | spin_unlock_irqrestore(&np->tx_lock, flags); |