summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Eckelmann2018-06-08 11:58:53 +0000
committerSven Eckelmann2018-07-17 18:21:06 +0000
commitccc93a4c45e0de503898569f42d0a3cb8fafe809 (patch)
tree5749c1484a2e8315fb26a3b8e27b437239f27895
parent74e9124611b10d3d7bc353b082b6348211314da9 (diff)
downloadrouting-ccc93a4c45e0de503898569f42d0a3cb8fafe809.tar.gz
batman-adv: Remove deprecated compat helpers
Signed-off-by: Sven Eckelmann <sven@narfation.org>
-rw-r--r--batman-adv/files/compat-hacks.h20
1 files changed, 1 insertions, 19 deletions
diff --git a/batman-adv/files/compat-hacks.h b/batman-adv/files/compat-hacks.h
index 0cf8e31..4511184 100644
--- 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>