| 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/compat-include/linux/minmax.h |
| +++ /dev/null |
| @@ -1,20 +0,0 @@ |
| -/* SPDX-License-Identifier: GPL-2.0 */ |
| -/* Copyright (C) B.A.T.M.A.N. contributors: |
| - * |
| - * Marek Lindner, Simon Wunderlich |
| - * |
| - * This file contains macros for maintaining compatibility with older versions |
| - * of the Linux kernel. |
| - */ |
| - |
| -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_ |
| -#define _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_ |
| - |
| -#include <linux/version.h> |
| -#if LINUX_VERSION_IS_GEQ(5, 10, 0) |
| -#include_next <linux/minmax.h> |
| -#else |
| -#include <linux/kernel.h> |
| -#endif |
| - |
| -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_ */ |
| --- a/net/batman-adv/bat_v.c |
| +++ b/net/batman-adv/bat_v.c |
| @@ -15,7 +15,6 @@ |
| #include <linux/jiffies.h> |
| #include <linux/kref.h> |
| #include <linux/list.h> |
| -#include <linux/minmax.h> |
| #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,6 @@ |
| #include <linux/jiffies.h> |
| #include <linux/kernel.h> |
| #include <linux/kref.h> |
| -#include <linux/minmax.h> |
| #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,6 @@ |
| #include <linux/kref.h> |
| #include <linux/list.h> |
| #include <linux/lockdep.h> |
| -#include <linux/minmax.h> |
| #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,8 @@ |
| #include <linux/gfp.h> |
| #include <linux/if_ether.h> |
| #include <linux/jiffies.h> |
| +#include <linux/kernel.h> |
| #include <linux/lockdep.h> |
| -#include <linux/minmax.h> |
| #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 |
| @@ -18,7 +18,6 @@ |
| #include <linux/kref.h> |
| #include <linux/limits.h> |
| #include <linux/list.h> |
| -#include <linux/minmax.h> |
| #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,6 @@ |
| #include <linux/kobject.h> |
| #include <linux/kref.h> |
| #include <linux/list.h> |
| -#include <linux/minmax.h> |
| #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,6 @@ |
| #include <linux/kernel.h> |
| #include <linux/limits.h> |
| #include <linux/list.h> |
| -#include <linux/minmax.h> |
| #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,6 @@ |
| #include <linux/kthread.h> |
| #include <linux/limits.h> |
| #include <linux/list.h> |
| -#include <linux/minmax.h> |
| #include <linux/netdevice.h> |
| #include <linux/param.h> |
| #include <linux/printk.h> |