Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit f79d36ee3009086b733454a1d093bd2f58511df0 Author: Linus Lüssing linus.luessing@c0d3.blue Date: Sun Jan 22 21:40:42 2017 +0100

batman-adv: compat: fix compile error for cfg80211_get_station on v3.15

station_info::expected_throughput is present since 3.16, not 3.15, resulting in compile errors for 3.15. Fixing this by using the correct kernel version in compat.h.

Fixes: 5c3245172c01 ("batman-adv: ELP - compute the metric based on the estimated throughput") Signed-off-by: Linus Lüssing linus.luessing@c0d3.blue Signed-off-by: Sven Eckelmann sven@narfation.org

f79d36ee3009086b733454a1d093bd2f58511df0 compat.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compat.h b/compat.h index 8628cf5..5397629 100644 --- a/compat.h +++ b/compat.h @@ -130,7 +130,7 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\

#endif /* < KERNEL_VERSION(3, 10, 0) */

-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0)

/* the expected behaviour of this function is to return 0 on success, therefore * it is possible to define it as 1 so that batman-adv thinks like something @@ -149,7 +149,7 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\

#endif

-#endif /* < KERNEL_VERSION(3, 15, 0) */ +#endif /* < KERNEL_VERSION(3, 16, 0) */

#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)