summaryrefslogtreecommitdiffstats
path: root/net/batman-adv
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2022-05-19 13:20:54 -0700
committerDavid S. Miller <davem@davemloft.net>2022-05-22 21:51:54 +0100
commitc304eddcecfe2513ff98ce3ae97d1c196d82ba08 (patch)
treeb790596c2d45437fa59fd108d0bc5ef25edca060 /net/batman-adv
parent5ff851b7be752a6d607c289b489c40f96f9dc489 (diff)
downloadlinux-stable-c304eddcecfe2513ff98ce3ae97d1c196d82ba08.tar.gz
linux-stable-c304eddcecfe2513ff98ce3ae97d1c196d82ba08.tar.bz2
linux-stable-c304eddcecfe2513ff98ce3ae97d1c196d82ba08.zip
net: wrap the wireless pointers in struct net_device in an ifdef
Most protocol-specific pointers in struct net_device are under a respective ifdef. Wireless is the notable exception. Since there's a sizable number of custom-built kernels for datacenter workloads which don't build wireless it seems reasonable to ifdefy those pointers as well. While at it move IPv4 and IPv6 pointers up, those are special for obvious reasons. Acked-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Stefan Schmidt <stefan@datenfreihafen.org> # ieee802154 Acked-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv')
-rw-r--r--net/batman-adv/hard-interface.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 83fb51b6e299..b8f8da7ee3de 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -307,9 +307,11 @@ static bool batadv_is_cfg80211_netdev(struct net_device *net_device)
if (!net_device)
return false;
+#if IS_ENABLED(CONFIG_CFG80211)
/* cfg80211 drivers have to set ieee80211_ptr */
if (net_device->ieee80211_ptr)
return true;
+#endif
return false;
}