batman-adv: Provide default settings examples for bat0

[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 a5277c8e48d24064a89e233527416b39dd603b79..45111848167e703d543ad241d0947efd8fe86649 100644 (file)
--- a/batman-adv/files/compat-hacks.h
+++ b/batman-adv/files/compat-hacks.h
@@ -11,25 +11,7 @@
 
 #endif /* < KERNEL_VERSION(4, 1, 0) */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0)
-
-/* Linux 3.15 misses the uapi include.... */
-#include <uapi/linux/nl80211.h>
-
-#endif /* < KERNEL_VERSION(3, 16, 0) */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
-
-#include <linux/netdevice.h>
-
-#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info, extack) ({\
-       BUILD_BUG_ON(upper_priv != NULL); \
-       BUILD_BUG_ON(upper_info != NULL); \
-       BUILD_BUG_ON(extack != NULL); \
-       netdev_set_master(dev, upper_dev); \
-})
-
-#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)
 
 #include <linux/netdevice.h>
 
@@ -98,6 +80,7 @@ struct batadv_ethtool_link_ksettings {
        struct {
                __u32   speed;
                __u8    duplex;
+               __u8    autoneg;
        } base;
 };
 
@@ -119,6 +102,7 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev,
 
        link_ksettings->base.duplex = cmd.duplex;
        link_ksettings->base.speed = ethtool_cmd_speed(&cmd);
+       link_ksettings->base.autoneg = cmd.autoneg;
 
        return 0;
 }
@@ -321,7 +305,7 @@ static inline void *batadv_skb_put_data(struct sk_buff *skb, const void *data,
 #define TIMER_DATA_TYPE                unsigned long
 #define TIMER_FUNC_TYPE                void (*)(TIMER_DATA_TYPE)
 
-static inline void     (struct timer_list *timer,
+static inline void timer_setup(struct timer_list *timer,
                               void (*callback)(struct timer_list *),
                               unsigned int flags)
 {
@@ -333,6 +317,36 @@ static inline void         (struct timer_list *timer,
        container_of(callback_timer, typeof(*var), timer_fieldname)
 
 #endif /* !from_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
+typedef unsigned __poll_t;
+#endif
+
+#endif /* < KERNEL_VERSION(4, 16, 0) */
 
 /* <DECLARE_EWMA> */
 
@@ -392,7 +406,7 @@ static inline void  (struct timer_list *timer,
        static inline void ewma_##name##_add(struct ewma_##name *e,     \
                                             unsigned long val)         \
        {                                                               \
-               unsigned long internal = ACCESS_ONCE(e->internal);      \
+               unsigned long internal = READ_ONCE(e->internal);        \
                unsigned long weight_rcp = ilog2(_weight_rcp);          \
                unsigned long precision = _precision;                   \
                                                                        \
@@ -401,10 +415,10 @@ static inline void        (struct timer_list *timer,
                BUILD_BUG_ON((_precision) > 30);                        \
                BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp);               \
                                                                        \
-               ACCESS_ONCE(e->internal) = internal ?                   \
+               WRITE_ONCE(e->internal, internal ?                      \
                        (((internal << weight_rcp) - internal) +        \
                                (val << precision)) >> weight_rcp :     \
-                       (val << precision);                             \
+                       (val << precision));                            \
        }
 
 /* </DECLARE_EWMA> */