And remove a BUG_TRAP from netdev_run_todo as well. Signed-off-by: Pavel Emelyanov <[EMAIL PROTECTED]>
--- diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 472d9cc..e94c636 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -577,7 +577,9 @@ struct net_device void *atalk_ptr; /* AppleTalk link */ void *ip_ptr; /* IPv4 specific data */ +#if defined(CONFIG_DECNET) || defined(CONFIG_DECNET_MODULE) void *dn_ptr; /* DECnet specific data */ +#endif void *ip6_ptr; /* IPv6 specific data */ #if defined(CONFIG_ECONET) || defined(CONFIG_ECONET_MODULE) void *ec_ptr; /* Econet specific data */ diff --git a/net/core/dev.c b/net/core/dev.c index 8726589..3ac35fe 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3781,7 +3781,9 @@ void netdev_run_todo(void) BUG_ON(atomic_read(&dev->refcnt)); BUG_TRAP(!dev->ip_ptr); BUG_TRAP(!dev->ip6_ptr); +#if defined(CONFIG_DECNET) || defined(CONFIG_DECNET_MODULE) BUG_TRAP(!dev->dn_ptr); +#endif if (dev->destructor) dev->destructor(dev); -- 1.5.3.4 - 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