aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2014-03-14 23:51:52 -0400
committerDavid S. Miller <davem@davemloft.net>2014-03-17 15:48:12 -0400
commit9c62a68d13119a1ca9718381d97b0cb415ff4e9d (patch)
treeaae7c0ffaa451dc44afbbba9c37780e9c12bd1fc /include/linux/netdevice.h
parente1bd4d3d7dd2a4a0e731ffe07c439927c23f16ea (diff)
netpoll: Remove dead packet receive code (CONFIG_NETPOLL_TRAP)
The netpoll packet receive code only becomes active if the netpoll rx_skb_hook is implemented, and there is not a single implementation of the netpoll rx_skb_hook in the kernel. All of the out of tree implementations I have found all call netpoll_poll which was removed from the kernel in 2011, so this change should not add any additional breakage. There are problems with the netpoll packet receive code. __netpoll_rx does not call dev_kfree_skb_irq or dev_kfree_skb_any in hard irq context. netpoll_neigh_reply leaks every skb it receives. Reception of packets does not work successfully on stacked devices (aka bonding, team, bridge, and vlans). Given that the netpoll packet receive code is buggy, there are no out of tree users that will be merged soon, and the code has not been used for in tree for a decade let's just remove it. Reverting this commit can server as a starting point for anyone who wants to resurrect netpoll packet reception support. Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index b8d8c805fd75..4b6d12c7b803 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1979,9 +1979,6 @@ struct net_device *__dev_get_by_index(struct net *net, int ifindex);
1979struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex); 1979struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
1980int netdev_get_name(struct net *net, char *name, int ifindex); 1980int netdev_get_name(struct net *net, char *name, int ifindex);
1981int dev_restart(struct net_device *dev); 1981int dev_restart(struct net_device *dev);
1982#ifdef CONFIG_NETPOLL_TRAP
1983int netpoll_trap(void);
1984#endif
1985int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb); 1982int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb);
1986 1983
1987static inline unsigned int skb_gro_offset(const struct sk_buff *skb) 1984static inline unsigned int skb_gro_offset(const struct sk_buff *skb)
@@ -2186,12 +2183,6 @@ static inline void netif_tx_start_all_queues(struct net_device *dev)
2186 2183
2187static inline void netif_tx_wake_queue(struct netdev_queue *dev_queue) 2184static inline void netif_tx_wake_queue(struct netdev_queue *dev_queue)
2188{ 2185{
2189#ifdef CONFIG_NETPOLL_TRAP
2190 if (netpoll_trap()) {
2191 netif_tx_start_queue(dev_queue);
2192 return;
2193 }
2194#endif
2195 if (test_and_clear_bit(__QUEUE_STATE_DRV_XOFF, &dev_queue->state)) 2186 if (test_and_clear_bit(__QUEUE_STATE_DRV_XOFF, &dev_queue->state))
2196 __netif_schedule(dev_queue->qdisc); 2187 __netif_schedule(dev_queue->qdisc);
2197} 2188}
@@ -2435,10 +2426,6 @@ static inline void netif_start_subqueue(struct net_device *dev, u16 queue_index)
2435static inline void netif_stop_subqueue(struct net_device *dev, u16 queue_index) 2426static inline void netif_stop_subqueue(struct net_device *dev, u16 queue_index)
2436{ 2427{
2437 struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index); 2428 struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
2438#ifdef CONFIG_NETPOLL_TRAP
2439 if (netpoll_trap())
2440 return;
2441#endif
2442 netif_tx_stop_queue(txq); 2429 netif_tx_stop_queue(txq);
2443} 2430}
2444 2431
@@ -2473,10 +2460,6 @@ static inline bool netif_subqueue_stopped(const struct net_device *dev,
2473static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index) 2460static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index)
2474{ 2461{
2475 struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index); 2462 struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
2476#ifdef CONFIG_NETPOLL_TRAP
2477 if (netpoll_trap())
2478 return;
2479#endif
2480 if (test_and_clear_bit(__QUEUE_STATE_DRV_XOFF, &txq->state)) 2463 if (test_and_clear_bit(__QUEUE_STATE_DRV_XOFF, &txq->state))
2481 __netif_schedule(txq->qdisc); 2464 __netif_schedule(txq->qdisc);
2482} 2465}