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>

diff --git a/include/linux/atalk.h b/include/linux/atalk.h
index 4d356e168692514c3e09e4686289693ab8b74579..40373920ea58a3e8be894c9b08725d562aa4fc28 100644 (file)
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.h
@@ -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);

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 936dc2c9dca16b395f66f5beede57aa4f82804f5..dbe6344b727ac60cdc6bf85a38632a1a5a6f890d 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -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;