batman-adv: add patches from 2018.1-maint 2018-06-12

[feed/routing.git] / batman-adv / files / compat-hacks.h

diff --git a/batman-adv/files/compat-hacks.h b/batman-adv/files/compat-hacks.h
index d7f30ada4507f953ddd9513714d9b4d58a5d1d13..d35cece49d8bfe38daf061ff8407d2203dd563f8 100644 (file)
--- a/batman-adv/files/compat-hacks.h
+++ b/batman-adv/files/compat-hacks.h
@@ -336,6 +336,26 @@ static inline void timer_setup(struct timer_list *timer,
        
 #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) */
+
+
 #ifdef __CHECK_POLL
 typedef unsigned __bitwise __poll_t;
 #else