From: Sven Eckelmann Date: Fri, 22 Feb 2019 19:40:11 +0000 (+0100) Subject: batman-adv: Drop cfg80211_get_station memset workaround X-Git-Url: http://git.openwrt.org/?p=feed%2Frouting.git;a=commitdiff_plain;h=ad27ee7f9a2973dde6c04f3a17f9a9ca97b48248 batman-adv: Drop cfg80211_get_station memset workaround The actual memset fix for cfg80211_get_station's sinfo is already part of the mac80211 package and doesn't have to be shipped anymore with batman-adv. Signed-off-by: Sven Eckelmann --- diff --git a/batman-adv/src/compat-hacks.h b/batman-adv/src/compat-hacks.h index 85c57be..cfeb348 100644 --- a/batman-adv/src/compat-hacks.h +++ b/batman-adv/src/compat-hacks.h @@ -146,28 +146,6 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev, #endif /* < KERNEL_VERSION(4, 15, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) - - -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) - -#include - -/* cfg80211 fix: https://patchwork.kernel.org/patch/10449857/ */ -static inline int batadv_cfg80211_get_station(struct net_device *dev, - const u8 *mac_addr, - struct station_info *sinfo) -{ - memset(sinfo, 0, sizeof(*sinfo)); - return cfg80211_get_station(dev, mac_addr, sinfo); -} - -#define cfg80211_get_station(dev, mac_addr, sinfo) \ - batadv_cfg80211_get_station(dev, mac_addr, sinfo) - -#endif /* < KERNEL_VERSION(4, 18, 0) */ - -#endif /* < KERNEL_VERSION(4, 16, 0) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)