Commit 19ff13f2 authored by David Ahern's avatar David Ahern Committed by David S. Miller

net: Make ax25_ptr depend on CONFIG_AX25

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 330c7272
...@@ -1804,7 +1804,9 @@ struct net_device { ...@@ -1804,7 +1804,9 @@ struct net_device {
struct dn_dev __rcu *dn_ptr; struct dn_dev __rcu *dn_ptr;
#endif #endif
struct inet6_dev __rcu *ip6_ptr; struct inet6_dev __rcu *ip6_ptr;
#if IS_ENABLED(CONFIG_AX25)
void *ax25_ptr; void *ax25_ptr;
#endif
struct wireless_dev *ieee80211_ptr; struct wireless_dev *ieee80211_ptr;
struct wpan_dev *ieee802154_ptr; struct wpan_dev *ieee802154_ptr;
#if IS_ENABLED(CONFIG_MPLS_ROUTING) #if IS_ENABLED(CONFIG_MPLS_ROUTING)
......
...@@ -318,10 +318,12 @@ void ax25_digi_invert(const ax25_digi *, ax25_digi *); ...@@ -318,10 +318,12 @@ void ax25_digi_invert(const ax25_digi *, ax25_digi *);
extern ax25_dev *ax25_dev_list; extern ax25_dev *ax25_dev_list;
extern spinlock_t ax25_dev_lock; extern spinlock_t ax25_dev_lock;
#if IS_ENABLED(CONFIG_AX25)
static inline ax25_dev *ax25_dev_ax25dev(struct net_device *dev) static inline ax25_dev *ax25_dev_ax25dev(struct net_device *dev)
{ {
return dev->ax25_ptr; return dev->ax25_ptr;
} }
#endif
ax25_dev *ax25_addr_ax25dev(ax25_address *); ax25_dev *ax25_addr_ax25dev(ax25_address *);
void ax25_dev_device_up(struct net_device *); void ax25_dev_device_up(struct net_device *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment