p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: Make atalk_ptr depend on ATALK or IRDA 

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern 2018-02-13 08:52:02 -08:00 committed by David S. Miller
parent 19ff13f2a4
commit 89e58148fb
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/atalk.h
View File

@ -113,10 +113,12 @@ extern void aarp_proto_init(void);
/* Inter module exports */ /* Inter module exports */
/* Give a device find its atif control structure */ /* 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) static inline struct atalk_iface *atalk_find_dev(struct net_device *dev)
{ {
return dev->atalk_ptr; return dev->atalk_ptr;
} }
#endif
extern struct atalk_addr *atalk_find_dev_addr(struct net_device *dev); extern struct atalk_addr *atalk_find_dev_addr(struct net_device *dev);
extern struct net_device *atrtr_get_dev(struct atalk_addr *sa); extern struct net_device *atrtr_get_dev(struct atalk_addr *sa);

2
include/linux/netdevice.h
View File

@ -1798,7 +1798,9 @@ struct net_device {
#if IS_ENABLED(CONFIG_TIPC) #if IS_ENABLED(CONFIG_TIPC)
struct tipc_bearer __rcu *tipc_ptr; struct tipc_bearer __rcu *tipc_ptr;
#endif #endif
#if IS_ENABLED(CONFIG_IRDA) || IS_ENABLED(CONFIG_ATALK)
void *atalk_ptr; void *atalk_ptr;
#endif
struct in_device __rcu *ip_ptr; struct in_device __rcu *ip_ptr;
#if IS_ENABLED(CONFIG_DECNET) #if IS_ENABLED(CONFIG_DECNET)
struct dn_dev __rcu *dn_ptr; struct dn_dev __rcu *dn_ptr;