OSDN Git Service

net: remove references to CONFIG_IRDA in network header files
authorLukas Bulwahn <lukas.bulwahn@gmail.com>
Wed, 29 Dec 2021 11:36:20 +0000 (12:36 +0100)
committerJakub Kicinski <kuba@kernel.org>
Fri, 31 Dec 2021 01:27:44 +0000 (17:27 -0800)
Commit d64c2a76123f ("staging: irda: remove the irda network stack and
drivers") removes the config IRDA.

Remove the remaining references to this non-existing config in the network
header files.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Link: https://lore.kernel.org/r/20211229113620.19368-1-lukas.bulwahn@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
include/linux/atalk.h
include/linux/netdevice.h

index f6034ba..a55bfc6 100644 (file)
@@ -113,7 +113,7 @@ extern int aarp_proto_init(void);
 /* Inter module exports */
 
 /* Give a device find its atif control structure */
-#if IS_ENABLED(CONFIG_IRDA) || IS_ENABLED(CONFIG_ATALK)
+#if IS_ENABLED(CONFIG_ATALK)
 static inline struct atalk_iface *atalk_find_dev(struct net_device *dev)
 {
        return dev->atalk_ptr;
index 2684bdb..6f99c8f 100644 (file)
@@ -2098,7 +2098,7 @@ struct net_device {
 #if IS_ENABLED(CONFIG_TIPC)
        struct tipc_bearer __rcu *tipc_ptr;
 #endif
-#if IS_ENABLED(CONFIG_IRDA) || IS_ENABLED(CONFIG_ATALK)
+#if IS_ENABLED(CONFIG_ATALK)
        void                    *atalk_ptr;
 #endif
        struct in_device __rcu  *ip_ptr;