diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/netdevice.h | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 58856b6737fb..41e1224651cf 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -1555,8 +1555,7 @@ static inline u32 netif_msg_init(int debug_value, int default_msg_enable_bits) | |||
1555 | } | 1555 | } |
1556 | 1556 | ||
1557 | /* Test if receive needs to be scheduled but only if up */ | 1557 | /* Test if receive needs to be scheduled but only if up */ |
1558 | static inline int netif_rx_schedule_prep(struct net_device *dev, | 1558 | static inline int netif_rx_schedule_prep(struct napi_struct *napi) |
1559 | struct napi_struct *napi) | ||
1560 | { | 1559 | { |
1561 | return napi_schedule_prep(napi); | 1560 | return napi_schedule_prep(napi); |
1562 | } | 1561 | } |
@@ -1564,27 +1563,24 @@ static inline int netif_rx_schedule_prep(struct net_device *dev, | |||
1564 | /* Add interface to tail of rx poll list. This assumes that _prep has | 1563 | /* Add interface to tail of rx poll list. This assumes that _prep has |
1565 | * already been called and returned 1. | 1564 | * already been called and returned 1. |
1566 | */ | 1565 | */ |
1567 | static inline void __netif_rx_schedule(struct net_device *dev, | 1566 | static inline void __netif_rx_schedule(struct napi_struct *napi) |
1568 | struct napi_struct *napi) | ||
1569 | { | 1567 | { |
1570 | __napi_schedule(napi); | 1568 | __napi_schedule(napi); |
1571 | } | 1569 | } |
1572 | 1570 | ||
1573 | /* Try to reschedule poll. Called by irq handler. */ | 1571 | /* Try to reschedule poll. Called by irq handler. */ |
1574 | 1572 | ||
1575 | static inline void netif_rx_schedule(struct net_device *dev, | 1573 | static inline void netif_rx_schedule(struct napi_struct *napi) |
1576 | struct napi_struct *napi) | ||
1577 | { | 1574 | { |
1578 | if (netif_rx_schedule_prep(dev, napi)) | 1575 | if (netif_rx_schedule_prep(napi)) |
1579 | __netif_rx_schedule(dev, napi); | 1576 | __netif_rx_schedule(napi); |
1580 | } | 1577 | } |
1581 | 1578 | ||
1582 | /* Try to reschedule poll. Called by dev->poll() after netif_rx_complete(). */ | 1579 | /* Try to reschedule poll. Called by dev->poll() after netif_rx_complete(). */ |
1583 | static inline int netif_rx_reschedule(struct net_device *dev, | 1580 | static inline int netif_rx_reschedule(struct napi_struct *napi) |
1584 | struct napi_struct *napi) | ||
1585 | { | 1581 | { |
1586 | if (napi_schedule_prep(napi)) { | 1582 | if (napi_schedule_prep(napi)) { |
1587 | __netif_rx_schedule(dev, napi); | 1583 | __netif_rx_schedule(napi); |
1588 | return 1; | 1584 | return 1; |
1589 | } | 1585 | } |
1590 | return 0; | 1586 | return 0; |
@@ -1593,8 +1589,7 @@ static inline int netif_rx_reschedule(struct net_device *dev, | |||
1593 | /* same as netif_rx_complete, except that local_irq_save(flags) | 1589 | /* same as netif_rx_complete, except that local_irq_save(flags) |
1594 | * has already been issued | 1590 | * has already been issued |
1595 | */ | 1591 | */ |
1596 | static inline void __netif_rx_complete(struct net_device *dev, | 1592 | static inline void __netif_rx_complete(struct napi_struct *napi) |
1597 | struct napi_struct *napi) | ||
1598 | { | 1593 | { |
1599 | __napi_complete(napi); | 1594 | __napi_complete(napi); |
1600 | } | 1595 | } |
@@ -1604,8 +1599,7 @@ static inline void __netif_rx_complete(struct net_device *dev, | |||
1604 | * it completes the work. The device cannot be out of poll list at this | 1599 | * it completes the work. The device cannot be out of poll list at this |
1605 | * moment, it is BUG(). | 1600 | * moment, it is BUG(). |
1606 | */ | 1601 | */ |
1607 | static inline void netif_rx_complete(struct net_device *dev, | 1602 | static inline void netif_rx_complete(struct napi_struct *napi) |
1608 | struct napi_struct *napi) | ||
1609 | { | 1603 | { |
1610 | napi_complete(napi); | 1604 | napi_complete(napi); |
1611 | } | 1605 | } |