From: Sven Eckelmann Date: Fri, 6 Mar 2020 19:05:58 +0000 (+0100) Subject: batman-adv: Drop compat code for Linux < 4.14 X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=bacc8c1385b1b60824d72c82f1ea7894d6a4472e;hp=05da6ef2ca59ed9b225c3d2874f15d53dda8d00c;p=feed%2Frouting.git batman-adv: Drop compat code for Linux < 4.14 The lowest kernel version supported by OpenWrt at the moment is Linux 4.14. It is therefore not required to have these dead code sections anymore. Signed-off-by: Sven Eckelmann --- diff --git a/batman-adv/src/compat-hacks.h b/batman-adv/src/compat-hacks.h index fd6cfe1..b57f7b6 100644 --- a/batman-adv/src/compat-hacks.h +++ b/batman-adv/src/compat-hacks.h @@ -64,40 +64,6 @@ static inline int batadv_ip_mc_check_igmp2(struct sk_buff *skb, #endif /* < KERNEL_VERSION(5, 1, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - -#include_next - -/* hack for netlink.c which marked the family ops as ro */ -#ifdef __ro_after_init -#undef __ro_after_init -#endif -#define __ro_after_init - -#endif /* < KERNEL_VERSION(4, 10, 0) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 9) - -#include - -/* work around missing attribute needs_free_netdev and priv_destructor in - * net_device - */ -#define ether_setup(dev) \ - void batadv_softif_free2(struct net_device *dev) \ - { \ - batadv_softif_free(dev); \ - free_netdev(dev); \ - } \ - void (*t1)(struct net_device *dev) __attribute__((unused)); \ - bool t2 __attribute__((unused)); \ - ether_setup(dev) -#define needs_free_netdev destructor = batadv_softif_free2; t2 -#define priv_destructor destructor = batadv_softif_free2; t1 - -#endif /* < KERNEL_VERSION(4, 11, 9) */ - - #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) #define batadv_softif_slave_add(__dev, __slave_dev, __extack) \