NETPOLL_TRAP is actually not used by any in-tree code.
Rather than exposing it in kernel configuration, make it a selectable
option and make sure API is stubbed properly. I.e: if not configured
then netpoll_set_trap is not available.
Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>
---
P.s: netpoll stuff should really be EXPORT_SYMBOL_GPL??
--- a/include/linux/netdevice.h 2007-11-03 11:30:57.000000000 -0700
+++ b/include/linux/netdevice.h 2007-11-03 11:30:59.000000000 -0700
@@ -837,8 +837,14 @@ extern int call_netdevice_notifiers(unsi
extern struct net_device *dev_get_by_index(struct net *net, int ifindex);
extern struct net_device *__dev_get_by_index(struct net *net, int
ifindex);
extern int dev_restart(struct net_device *dev);
+
#ifdef CONFIG_NETPOLL_TRAP
extern int netpoll_trap(void);
+extern void netpoll_set_trap(int trap);
+#else
+static inline int netpoll_trap(void) {
+ return 0;
+}
#endif
static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev,
@@ -918,12 +924,11 @@ static inline void netif_start_queue(str
*/
static inline void netif_wake_queue(struct net_device *dev)
{
-#ifdef CONFIG_NETPOLL_TRAP
if (netpoll_trap()) {
clear_bit(__LINK_STATE_XOFF, &dev->state);
return;
}
-#endif
+
if (test_and_clear_bit(__LINK_STATE_XOFF, &dev->state))
__netif_schedule(dev);
}
@@ -993,10 +998,8 @@ static inline void netif_start_subqueue(
static inline void netif_stop_subqueue(struct net_device *dev, u16 queue_index)
{
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
-#ifdef CONFIG_NETPOLL_TRAP
if (netpoll_trap())
return;
-#endif
set_bit(__LINK_STATE_XOFF, &dev->egress_subqueue[queue_index].state);
#endif
}
@@ -1035,10 +1038,8 @@ static inline int netif_subqueue_stopped
static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index)
{
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
-#ifdef CONFIG_NETPOLL_TRAP
if (netpoll_trap())
return;
-#endif
if (test_and_clear_bit(__LINK_STATE_XOFF,
&dev->egress_subqueue[queue_index].state))
__netif_schedule(dev);
--- a/drivers/net/Kconfig 2007-11-03 11:30:57.000000000 -0700
+++ b/drivers/net/Kconfig 2007-11-03 11:30:59.000000000 -0700
@@ -3118,8 +3118,8 @@ config NETCONSOLE_DYNAMIC
config NETPOLL
def_bool NETCONSOLE
+# If needed use select to enable
config NETPOLL_TRAP
- bool "Netpoll traffic trapping"
default n
depends on NETPOLL
--- a/net/core/netpoll.c 2007-11-03 11:30:57.000000000 -0700
+++ b/net/core/netpoll.c 2007-11-03 11:31:45.000000000 -0700
@@ -803,6 +803,7 @@ void netpoll_cleanup(struct netpoll *np)
np->dev = NULL;
}
+#ifdef CONFIG_NETPOLL_TRAP
int netpoll_trap(void)
{
return atomic_read(&trapped);
@@ -818,6 +819,8 @@ void netpoll_set_trap(int trap)
EXPORT_SYMBOL(netpoll_set_trap);
EXPORT_SYMBOL(netpoll_trap);
+#endif
+
EXPORT_SYMBOL(netpoll_print_options);
EXPORT_SYMBOL(netpoll_parse_options);
EXPORT_SYMBOL(netpoll_setup);
--
Stephen Hemminger <[EMAIL PROTECTED]>
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
