net: Make dn_ptr depend on CONFIG_DECNET

Signed-off-by: David Ahern <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 5eef6c8e274199d4f37e30cb463fc19d13868b3c..d2ef35e00626b81bc4f0c3b28a4a19b5c403468c 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1800,7 +1800,9 @@ struct net_device {
 #endif
        void                    *atalk_ptr;
        struct in_device __rcu  *ip_ptr;
+#if IS_ENABLED(CONFIG_DECNET)
        struct dn_dev __rcu     *dn_ptr;
+#endif
        struct inet6_dev __rcu  *ip6_ptr;
        void                    *ax25_ptr;
        struct wireless_dev     *ieee80211_ptr;

diff --git a/net/core/dev.c b/net/core/dev.c
index df5241c8eda1ad1be45a09b5649347f67a7f2763..4bd4ad7ffda4cf56314e3e4a7f9b1ddc7412f3db 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -8134,8 +8134,9 @@ void netdev_run_todo(void)
                BUG_ON(!list_empty(&dev->ptype_specific));
                WARN_ON(rcu_access_pointer(dev->ip_ptr));
                WARN_ON(rcu_access_pointer(dev->ip6_ptr));
+#if IS_ENABLED(CONFIG_DECNET)
                WARN_ON(dev->dn_ptr);
-
+#endif
                if (dev->priv_destructor)
                        dev->priv_destructor(dev);
                if (dev->needs_free_netdev)