netpoll: kill CONFIG_NETPOLL_RX

PATCH New Matt Mackall 1 participant 1 message Aug 26, 2004

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Matt Mackall

author

2004-08-26 20:09 UTC #0 lore raw

PATCH 3/5 netpoll: kill CONFIG_NETPOLL_RX

From: Jeff Moyer <[email protected]>

This patch removes CONFIG_NETPOLL_RX, as discussed.

Signed-off-by Jeff Moyer <[email protected]>

Signed-off-by Matt Mackall <[email protected]>

include/linux/netdevice.h +1 -1

Index: linux/include/linux/netdevice.h
===================================================================
@@ -462,7 +462,7 @@
 						     unsigned char *haddr);
 	int			(*neigh_setup)(struct net_device *dev, struct neigh_parms *);
 	int			(*accept_fastpath)(struct net_device *, struct dst_entry*);
-#ifdef CONFIG_NETPOLL_RX
+#ifdef CONFIG_NETPOLL
 	int			netpoll_rx;
 #endif
 #ifdef CONFIG_NET_POLL_CONTROLLER

net/core/netpoll.c +1 -5

Index: linux/net/core/netpoll.c
===================================================================
@@ -603,9 +603,7 @@
 	if(np->rx_hook) {
 		unsigned long flags;
 
-#ifdef CONFIG_NETPOLL_RX
 		np->dev->netpoll_rx = 1;
-#endif
 
 		spin_lock_irqsave(&rx_list_lock, flags);
 		list_add(&np->rx_list, &rx_list);

@@ -625,12 +623,10 @@
 
 		spin_lock_irqsave(&rx_list_lock, flags);
 		list_del(&np->rx_list);
-#ifdef CONFIG_NETPOLL_RX
-		np->dev->netpoll_rx = 0;
-#endif
 		spin_unlock_irqrestore(&rx_list_lock, flags);
 	}
 
+	np->dev->netpoll_rx = 0;
 	dev_put(np->dev);
 	np->dev = NULL;
 }

net/core/dev.c +2 -2

Index: linux/net/core/dev.c
===================================================================
@@ -1558,7 +1558,7 @@
 	struct softnet_data *queue;
 	unsigned long flags;
 
-#ifdef CONFIG_NETPOLL_RX
+#ifdef CONFIG_NETPOLL
 	if (skb->dev->netpoll_rx && netpoll_rx(skb)) {
 		kfree_skb(skb);
 		return NET_RX_DROP;

@@ -1762,7 +1762,7 @@
 	int ret = NET_RX_DROP;
 	unsigned short type;
 
-#ifdef CONFIG_NETPOLL_RX
+#ifdef CONFIG_NETPOLL
 	if (skb->dev->netpoll_rx && skb->dev->poll && netpoll_rx(skb)) {
 		kfree_skb(skb);
 		return NET_RX_DROP;

net/Kconfig +0 -5

Index: linux/net/Kconfig
===================================================================
@@ -635,11 +635,6 @@
 config NETPOLL
 	def_bool NETCONSOLE
 
-config NETPOLL_RX
-	bool "Netpoll support for trapping incoming packets"
-	default n
-	depends on NETPOLL
-
 config NETPOLL_TRAP
 	bool "Netpoll traffic trapping"
 	default n

Signature · 1 line

Mathematics is the supreme nostalgia of our time.