net: dev: Make protocol ptr dependent on CONFIG
Subsystems (3)
cover net: dev: Make protocol ptr dependent on CONFIG
Found these in a branch from 3-years ago. Still relevant today. Make decnet, ax25, and atalk ptrs in net_device based on their respective CONFIG.
David Ahern (4):
net: Make dn_ptr depend on CONFIG_DECNET
net: Make ax25_ptr depend on CONFIG_AX25
net: Make atalk_ptr depend on ATALK or IRDA
net: Remove atalk header from socket.c
include/linux/atalk.h | 2 ++ include/linux/netdevice.h | 6 ++++++ include/net/ax25.h | 2 ++ net/core/dev.c | 3 ++- net/socket.c | 1 - 5 files changed, 12 insertions(+), 2 deletions(-)
Signature · 1 line
2.11.0
PATCH 1/4 net: Make dn_ptr depend on CONFIG_DECNET
--- include/linux/netdevice.h | 2 ++ net/core/dev.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-)
include/linux/netdevice.h +2 -0
@@ -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;
net/core/dev.c +2 -1
@@ -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)
Signature · 1 line
2.11.0
PATCH 2/4 net: Make ax25_ptr depend on CONFIG_AX25
In reply to David Ahern--- include/linux/netdevice.h | 2 ++ include/net/ax25.h | 2 ++ 2 files changed, 4 insertions(+)
include/linux/netdevice.h +2 -0
@@ -1804,7 +1804,9 @@ struct net_device {struct dn_dev __rcu *dn_ptr;#endif struct inet6_dev __rcu *ip6_ptr; +#if IS_ENABLED (CONFIG_AX25 )void *ax25_ptr; +#endif struct wireless_dev *ieee80211_ptr;struct wpan_dev *ieee802154_ptr;#if IS_ENABLED (CONFIG_MPLS_ROUTING )
include/net/ax25.h +2 -0
@@ -318,10 +318,12 @@ void ax25_digi_invert(const ax25_digi *, ax25_digi *);extern ax25_dev *ax25_dev_list;extern spinlock_t ax25_dev_lock; +#if IS_ENABLED (CONFIG_AX25 )static inline ax25_dev *ax25_dev_ax25dev (struct net_device *dev) {return dev->ax25_ptr; } +#endif ax25_dev *ax25_addr_ax25dev (ax25_address *);void ax25_dev_device_up (struct net_device *);
Signature · 1 line
2.11.0
PATCH 3/4 net: Make atalk_ptr depend on ATALK or IRDA
In reply to David AhernFrom: David Ahern <[email protected]>
--- include/linux/atalk.h | 2 ++ include/linux/netdevice.h | 2 ++ 2 files changed, 4 insertions(+)
include/linux/atalk.h +2 -0
@@ -113,10 +113,12 @@ extern void aarp_proto_init(void);/* Inter module exports */ /* Give a device find its atif control structure */ +#if IS_ENABLED (CONFIG_IRDA ) ||IS_ENABLED (CONFIG_ATALK )static inline struct atalk_iface *atalk_find_dev (struct net_device *dev) {return dev->atalk_ptr; } +#endif extern struct atalk_addr *atalk_find_dev_addr (struct net_device *dev);extern struct net_device *atrtr_get_dev (struct atalk_addr *sa);
include/linux/netdevice.h +2 -0
@@ -1798,7 +1798,9 @@ struct net_device {#if IS_ENABLED (CONFIG_TIPC )struct tipc_bearer __rcu *tipc_ptr;#endif +#if IS_ENABLED (CONFIG_IRDA ) ||IS_ENABLED (CONFIG_ATALK )void *atalk_ptr; +#endif struct in_device __rcu *ip_ptr;#if IS_ENABLED (CONFIG_DECNET )struct dn_dev __rcu *dn_ptr;
Signature · 1 line
2.11.0
PATCH 4/4 net: Remove atalk header from socket.c
In reply to David Ahern--- net/socket.c | 1 - 1 file changed, 1 deletion(-)
net/socket.c +0 -1
@@ -104,7 +104,6 @@#include <linux/ipv6_route.h> #include <linux/route.h> #include <linux/sockios.h> -#include <linux/atalk.h> #include <net/busy_poll.h> #include <linux/errqueue.h>
Signature · 1 line
2.11.0
David Miller
maintainerFrom: David Ahern <[email protected]>
Date: Tue, 13 Feb 2018 08:51:59 -0800
Quoted 3 lines
Found these in a branch from 3-years ago. Still relevant today. Make decnet, ax25, and atalk ptrs in
net_devicebased on their respective CONFIG.
Looks good, series applied.
That decnet pointer WARN_ON() in net/core/dev.c can problem be simply removed.