aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 322b5eae57dd..da7a13c97eb8 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -262,8 +262,6 @@ enum netdev_state_t
262 __LINK_STATE_LINKWATCH_PENDING, 262 __LINK_STATE_LINKWATCH_PENDING,
263 __LINK_STATE_DORMANT, 263 __LINK_STATE_DORMANT,
264 __LINK_STATE_QDISC_RUNNING, 264 __LINK_STATE_QDISC_RUNNING,
265 /* Set by the netpoll NAPI code */
266 __LINK_STATE_POLL_LIST_FROZEN,
267}; 265};
268 266
269 267
@@ -1022,14 +1020,6 @@ static inline void netif_rx_complete(struct net_device *dev)
1022{ 1020{
1023 unsigned long flags; 1021 unsigned long flags;
1024 1022
1025#ifdef CONFIG_NETPOLL
1026 /* Prevent race with netpoll - yes, this is a kludge.
1027 * But at least it doesn't penalize the non-netpoll
1028 * code path. */
1029 if (test_bit(__LINK_STATE_POLL_LIST_FROZEN, &dev->state))
1030 return;
1031#endif
1032
1033 local_irq_save(flags); 1023 local_irq_save(flags);
1034 __netif_rx_complete(dev); 1024 __netif_rx_complete(dev);
1035 local_irq_restore(flags); 1025 local_irq_restore(flags);