mirror of
https://github.com/coolsnowwolf/routing.git
synced 2025-05-01 13:59:26 +08:00
112 lines
2.9 KiB
Diff
112 lines
2.9 KiB
Diff
From: Sven Eckelmann <sven@narfation.org>
|
|
Date: Thu, 28 Jan 2021 21:06:51 +0100
|
|
Subject: Revert "batman-adv: Add new include for min/max helpers"
|
|
|
|
The OpenWrt kernel sources and backports sources are currently missing this
|
|
header.
|
|
|
|
This reverts commit 1810de05310d5c5e9140f870ac21052f38bc06b8.
|
|
|
|
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
|
|
--- a/net/batman-adv/bat_v.c
|
|
+++ b/net/batman-adv/bat_v.c
|
|
@@ -15,7 +15,9 @@
|
|
#include <linux/jiffies.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/list.h>
|
|
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
|
|
#include <linux/minmax.h>
|
|
+#endif
|
|
#include <linux/netdevice.h>
|
|
#include <linux/netlink.h>
|
|
#include <linux/rculist.h>
|
|
--- a/net/batman-adv/bat_v_elp.c
|
|
+++ b/net/batman-adv/bat_v_elp.c
|
|
@@ -18,7 +18,9 @@
|
|
#include <linux/jiffies.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/kref.h>
|
|
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
|
|
#include <linux/minmax.h>
|
|
+#endif
|
|
#include <linux/netdevice.h>
|
|
#include <linux/nl80211.h>
|
|
#include <linux/prandom.h>
|
|
--- a/net/batman-adv/bat_v_ogm.c
|
|
+++ b/net/batman-adv/bat_v_ogm.c
|
|
@@ -18,7 +18,9 @@
|
|
#include <linux/kref.h>
|
|
#include <linux/list.h>
|
|
#include <linux/lockdep.h>
|
|
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
|
|
#include <linux/minmax.h>
|
|
+#endif
|
|
#include <linux/mutex.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/prandom.h>
|
|
--- a/net/batman-adv/fragmentation.c
|
|
+++ b/net/batman-adv/fragmentation.c
|
|
@@ -14,8 +14,13 @@
|
|
#include <linux/gfp.h>
|
|
#include <linux/if_ether.h>
|
|
#include <linux/jiffies.h>
|
|
+#if LINUX_VERSION_IS_LESS(5, 10, 0)
|
|
+#include <linux/kernel.h>
|
|
+#endif
|
|
#include <linux/lockdep.h>
|
|
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
|
|
#include <linux/minmax.h>
|
|
+#endif
|
|
#include <linux/netdevice.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/slab.h>
|
|
--- a/net/batman-adv/hard-interface.c
|
|
+++ b/net/batman-adv/hard-interface.c
|
|
@@ -17,7 +17,9 @@
|
|
#include <linux/kref.h>
|
|
#include <linux/limits.h>
|
|
#include <linux/list.h>
|
|
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
|
|
#include <linux/minmax.h>
|
|
+#endif
|
|
#include <linux/mutex.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/printk.h>
|
|
--- a/net/batman-adv/main.c
|
|
+++ b/net/batman-adv/main.c
|
|
@@ -23,7 +23,9 @@
|
|
#include <linux/kobject.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/list.h>
|
|
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
|
|
#include <linux/minmax.h>
|
|
+#endif
|
|
#include <linux/module.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/printk.h>
|
|
--- a/net/batman-adv/netlink.c
|
|
+++ b/net/batman-adv/netlink.c
|
|
@@ -23,7 +23,9 @@
|
|
#include <linux/kernel.h>
|
|
#include <linux/limits.h>
|
|
#include <linux/list.h>
|
|
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
|
|
#include <linux/minmax.h>
|
|
+#endif
|
|
#include <linux/netdevice.h>
|
|
#include <linux/netlink.h>
|
|
#include <linux/printk.h>
|
|
--- a/net/batman-adv/tp_meter.c
|
|
+++ b/net/batman-adv/tp_meter.c
|
|
@@ -23,7 +23,9 @@
|
|
#include <linux/kthread.h>
|
|
#include <linux/limits.h>
|
|
#include <linux/list.h>
|
|
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
|
|
#include <linux/minmax.h>
|
|
+#endif
|
|
#include <linux/netdevice.h>
|
|
#include <linux/param.h>
|
|
#include <linux/printk.h>
|