Repository : ssh://git@diktynna/batman-adv

On branch : master

commit caa1eb0cf7bf8ebfe43bba06b890252a865efa91 Author: Jakub Kicinski kuba@kernel.org Date: Thu May 19 13:20:54 2022 -0700

batman-adv: 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 Signed-off-by: Sven Eckelmann sven@narfation.org

caa1eb0cf7bf8ebfe43bba06b890252a865efa91 net/batman-adv/hard-interface.c | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 83fb51b6..b8f8da7e 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; }