diff options
| author | David Ahern | 2018-02-13 17:52:01 +0100 |
|---|---|---|
| committer | David S. Miller | 2018-02-14 17:55:33 +0100 |
| commit | 19ff13f2a411d99af67d8e51867d54b86e1bf017 (patch) | |
| tree | ed927a216d9bc02fea84de07153e843cc67391b3 | |
| parent | net: Make dn_ptr depend on CONFIG_DECNET (diff) | |
| download | kernel-qcow2-linux-19ff13f2a411d99af67d8e51867d54b86e1bf017.tar.gz kernel-qcow2-linux-19ff13f2a411d99af67d8e51867d54b86e1bf017.tar.xz kernel-qcow2-linux-19ff13f2a411d99af67d8e51867d54b86e1bf017.zip | |
net: Make ax25_ptr depend on CONFIG_AX25
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/netdevice.h | 2 | ||||
| -rw-r--r-- | include/net/ax25.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index d2ef35e00626..936dc2c9dca1 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -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) diff --git a/include/net/ax25.h b/include/net/ax25.h index 76fb39c272a7..c91bc87931c7 100644 --- a/include/net/ax25.h +++ b/include/net/ax25.h @@ -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 *); |