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

On branches: maint,master

commit 33cc78db4852ee8d07f2c21dca9f297dd3b2ccef Author: Sven Eckelmann sven@narfation.org Date: Fri Jul 21 11:17:09 2017 +0200

batman-adv: Only enable priv_destructor compat for < 4.11.9

The teardown netdev API change 33e9de0c769c ("batman-adv: Fix inconsistent teardown and release of private netdev state.") was backported to Linux 4.11.9. The compat code to switch back to the old style destructor code must therefore not be enabled for Linux >= 4.11.9.

Reported-by: Ruben Kelevra cyrond@gmail.com Signed-off-by: Sven Eckelmann sven@narfation.org

33cc78db4852ee8d07f2c21dca9f297dd3b2ccef compat-include/linux/netdevice.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index 1b36e529..00ed5e40 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -86,7 +86,7 @@ static inline void batadv_netif_trans_update(struct net_device *dev)

#endif /* < KERNEL_VERSION(4, 7, 0) */

-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 9)

/* work around missing attribute needs_free_netdev and priv_destructor in * net_device @@ -103,6 +103,6 @@ static inline void batadv_netif_trans_update(struct net_device *dev) #define needs_free_netdev destructor = batadv_softif_free2; t2 #define priv_destructor destructor = batadv_softif_free2; t1

-#endif /* < KERNEL_VERSION(4, 12, 0) */ +#endif /* < KERNEL_VERSION(4, 11, 9) */

#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_NETDEVICE_H_ */