xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: Make dn_ptr depend on CONFIG_DECNET

Browse Source 
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern
2018-02-13 08:52:00 -08:00
committed by David S. Miller
parent 7707968361
commit 330c7272c4
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/netdevice.h
View File

@@ -1800,7 +1800,9 @@ struct net_device {
#endif #endif
void *atalk_ptr; void *atalk_ptr;
struct in_device __rcu *ip_ptr; struct in_device __rcu *ip_ptr;
#if IS_ENABLED(CONFIG_DECNET)
struct dn_dev __rcu *dn_ptr; struct dn_dev __rcu *dn_ptr;
#endif
struct inet6_dev __rcu *ip6_ptr; struct inet6_dev __rcu *ip6_ptr;
void *ax25_ptr; void *ax25_ptr;
struct wireless_dev *ieee80211_ptr; struct wireless_dev *ieee80211_ptr;

3
net/core/dev.c
View File

@@ -8134,8 +8134,9 @@ void netdev_run_todo(void)
BUG_ON(!list_empty(&dev->ptype_specific)); BUG_ON(!list_empty(&dev->ptype_specific));
WARN_ON(rcu_access_pointer(dev->ip_ptr)); WARN_ON(rcu_access_pointer(dev->ip_ptr));
WARN_ON(rcu_access_pointer(dev->ip6_ptr)); WARN_ON(rcu_access_pointer(dev->ip6_ptr));
#if IS_ENABLED(CONFIG_DECNET)
WARN_ON(dev->dn_ptr); WARN_ON(dev->dn_ptr);
#endif
if (dev->priv_destructor) if (dev->priv_destructor)
dev->priv_destructor(dev); dev->priv_destructor(dev);
if (dev->needs_free_netdev) if (dev->needs_free_netdev)