| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | From: Sven Eckelmann <sven@narfation.org> |
| 2 | Date: Thu, 28 Jan 2021 21:06:51 +0100 |
| 3 | Subject: Revert "batman-adv: Add new include for min/max helpers" |
| 4 | |
| 5 | The OpenWrt kernel sources and backports sources are currently missing this |
| 6 | header. |
| 7 | |
| 8 | This reverts commit 1810de05310d5c5e9140f870ac21052f38bc06b8. |
| 9 | |
| 10 | Signed-off-by: Sven Eckelmann <sven@narfation.org> |
| 11 | |
| 12 | --- a/compat-include/linux/minmax.h |
| 13 | +++ /dev/null |
| 14 | @@ -1,20 +0,0 @@ |
| 15 | -/* SPDX-License-Identifier: GPL-2.0 */ |
| 16 | -/* Copyright (C) B.A.T.M.A.N. contributors: |
| 17 | - * |
| 18 | - * Marek Lindner, Simon Wunderlich |
| 19 | - * |
| 20 | - * This file contains macros for maintaining compatibility with older versions |
| 21 | - * of the Linux kernel. |
| 22 | - */ |
| 23 | - |
| 24 | -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_ |
| 25 | -#define _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_ |
| 26 | - |
| 27 | -#include <linux/version.h> |
| 28 | -#if LINUX_VERSION_IS_GEQ(5, 10, 0) |
| 29 | -#include_next <linux/minmax.h> |
| 30 | -#else |
| 31 | -#include <linux/kernel.h> |
| 32 | -#endif |
| 33 | - |
| 34 | -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_ */ |
| 35 | --- a/net/batman-adv/bat_v.c |
| 36 | +++ b/net/batman-adv/bat_v.c |
| 37 | @@ -15,7 +15,6 @@ |
| 38 | #include <linux/jiffies.h> |
| 39 | #include <linux/kref.h> |
| 40 | #include <linux/list.h> |
| 41 | -#include <linux/minmax.h> |
| 42 | #include <linux/netdevice.h> |
| 43 | #include <linux/netlink.h> |
| 44 | #include <linux/rculist.h> |
| 45 | --- a/net/batman-adv/bat_v_elp.c |
| 46 | +++ b/net/batman-adv/bat_v_elp.c |
| 47 | @@ -18,7 +18,6 @@ |
| 48 | #include <linux/jiffies.h> |
| 49 | #include <linux/kernel.h> |
| 50 | #include <linux/kref.h> |
| 51 | -#include <linux/minmax.h> |
| 52 | #include <linux/netdevice.h> |
| 53 | #include <linux/nl80211.h> |
| 54 | #include <linux/prandom.h> |
| 55 | --- a/net/batman-adv/bat_v_ogm.c |
| 56 | +++ b/net/batman-adv/bat_v_ogm.c |
| 57 | @@ -18,7 +18,6 @@ |
| 58 | #include <linux/kref.h> |
| 59 | #include <linux/list.h> |
| 60 | #include <linux/lockdep.h> |
| 61 | -#include <linux/minmax.h> |
| 62 | #include <linux/mutex.h> |
| 63 | #include <linux/netdevice.h> |
| 64 | #include <linux/prandom.h> |
| 65 | --- a/net/batman-adv/fragmentation.c |
| 66 | +++ b/net/batman-adv/fragmentation.c |
| 67 | @@ -14,8 +14,8 @@ |
| 68 | #include <linux/gfp.h> |
| 69 | #include <linux/if_ether.h> |
| 70 | #include <linux/jiffies.h> |
| 71 | +#include <linux/kernel.h> |
| 72 | #include <linux/lockdep.h> |
| 73 | -#include <linux/minmax.h> |
| 74 | #include <linux/netdevice.h> |
| 75 | #include <linux/skbuff.h> |
| 76 | #include <linux/slab.h> |
| 77 | --- a/net/batman-adv/hard-interface.c |
| 78 | +++ b/net/batman-adv/hard-interface.c |
| 79 | @@ -18,7 +18,6 @@ |
| 80 | #include <linux/kref.h> |
| 81 | #include <linux/limits.h> |
| 82 | #include <linux/list.h> |
| 83 | -#include <linux/minmax.h> |
| 84 | #include <linux/mutex.h> |
| 85 | #include <linux/netdevice.h> |
| 86 | #include <linux/printk.h> |
| 87 | --- a/net/batman-adv/main.c |
| 88 | +++ b/net/batman-adv/main.c |
| 89 | @@ -23,7 +23,6 @@ |
| 90 | #include <linux/kobject.h> |
| 91 | #include <linux/kref.h> |
| 92 | #include <linux/list.h> |
| 93 | -#include <linux/minmax.h> |
| 94 | #include <linux/module.h> |
| 95 | #include <linux/netdevice.h> |
| 96 | #include <linux/printk.h> |
| 97 | --- a/net/batman-adv/netlink.c |
| 98 | +++ b/net/batman-adv/netlink.c |
| 99 | @@ -23,7 +23,6 @@ |
| 100 | #include <linux/kernel.h> |
| 101 | #include <linux/limits.h> |
| 102 | #include <linux/list.h> |
| 103 | -#include <linux/minmax.h> |
| 104 | #include <linux/netdevice.h> |
| 105 | #include <linux/netlink.h> |
| 106 | #include <linux/printk.h> |
| 107 | --- a/net/batman-adv/tp_meter.c |
| 108 | +++ b/net/batman-adv/tp_meter.c |
| 109 | @@ -23,7 +23,6 @@ |
| 110 | #include <linux/kthread.h> |
| 111 | #include <linux/limits.h> |
| 112 | #include <linux/list.h> |
| 113 | -#include <linux/minmax.h> |
| 114 | #include <linux/netdevice.h> |
| 115 | #include <linux/param.h> |
| 116 | #include <linux/printk.h> |