[commits] [openwrt-feed-devel] master: batman-adv-devel: Drop cfg80211_get_station memset workaround (1739aba)

postmaster at open-mesh.org postmaster at open-mesh.org
Sat Mar 9 13:02:44 CET 2019


Repository : ssh://git@open-mesh.org/openwrt-feed-devel

On branch  : master

>---------------------------------------------------------------

commit 1739aba722180fdc00271d7163b1c8b30d27e158
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Feb 22 20:40:11 2019 +0100

    batman-adv-devel: 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 <sven at narfation.org>


>---------------------------------------------------------------

1739aba722180fdc00271d7163b1c8b30d27e158
 batman-adv-devel/src/compat-hacks.h | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/batman-adv-devel/src/compat-hacks.h b/batman-adv-devel/src/compat-hacks.h
index 85c57be..cfeb348 100644
--- a/batman-adv-devel/src/compat-hacks.h
+++ b/batman-adv-devel/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 <net/cfg80211.h>
-
-/* 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)
 



More information about the commits mailing list