batman-adv/patches/0002-Revert-batman-adv-Add-new-include-for-min-max-helper.patch

   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 diff --git a/compat-include/linux/minmax.h b/compat-include/linux/minmax.h
  13 deleted file mode 100644
  14 index 4b19479bc5ea12c5005485f623decfad90a85cff..0000000000000000000000000000000000000000
  15 --- a/compat-include/linux/minmax.h
  16 +++ /dev/null
  17 @@ -1,20 +0,0 @@
  18 -/* SPDX-License-Identifier: GPL-2.0 */
  19 -/* Copyright (C) 2007-2020  B.A.T.M.A.N. contributors:
  20 - *
  21 - * Marek Lindner, Simon Wunderlich
  22 - *
  23 - * This file contains macros for maintaining compatibility with older versions
  24 - * of the Linux kernel.
  25 - */
  26 -
  27 -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_
  28 -#define _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_
  29 -
  30 -#include <linux/version.h>
  31 -#if LINUX_VERSION_IS_GEQ(5, 10, 0)
  32 -#include_next <linux/minmax.h>
  33 -#else
  34 -#include <linux/kernel.h>
  35 -#endif
  36 -
  37 -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_ */
  38 diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
  39 index e4455babe4c28f8c1527a17e825675183c37ea1d..22183e954647089ca72a941e744375d72e1f94b0 100644
  40 --- a/net/batman-adv/bat_v.c
  41 +++ b/net/batman-adv/bat_v.c
  42 @@ -15,7 +15,6 @@
  43  #include <linux/jiffies.h>
  44  #include <linux/kref.h>
  45  #include <linux/list.h>
  46 -#include <linux/minmax.h>
  47  #include <linux/netdevice.h>
  48  #include <linux/netlink.h>
  49  #include <linux/rculist.h>
  50 diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
  51 index 0512ea6cd818c22768e601f446ff806cf863163b..79a7dfc32e76c511c5b5d8716cbebf64f6228d9d 100644
  52 --- a/net/batman-adv/bat_v_elp.c
  53 +++ b/net/batman-adv/bat_v_elp.c
  54 @@ -18,7 +18,6 @@
  55  #include <linux/jiffies.h>
  56  #include <linux/kernel.h>
  57  #include <linux/kref.h>
  58 -#include <linux/minmax.h>
  59  #include <linux/netdevice.h>
  60  #include <linux/nl80211.h>
  61  #include <linux/prandom.h>
  62 diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c
  63 index 798d659855d0bcc9d7638901fedeb77d830f1980..8c1148fc73d776c076bdb35896f5536d7378578d 100644
  64 --- a/net/batman-adv/bat_v_ogm.c
  65 +++ b/net/batman-adv/bat_v_ogm.c
  66 @@ -18,7 +18,6 @@
  67  #include <linux/kref.h>
  68  #include <linux/list.h>
  69  #include <linux/lockdep.h>
  70 -#include <linux/minmax.h>
  71  #include <linux/mutex.h>
  72  #include <linux/netdevice.h>
  73  #include <linux/prandom.h>
  74 diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
  75 index e522f1fcfd9af04ee2d92b1b11ace6960d6f9c9f..ea40e54867573320d44e68524589454db553fb81 100644
  76 --- a/net/batman-adv/fragmentation.c
  77 +++ b/net/batman-adv/fragmentation.c
  78 @@ -14,8 +14,8 @@
  79  #include <linux/gfp.h>
  80  #include <linux/if_ether.h>
  81  #include <linux/jiffies.h>
  82 +#include <linux/kernel.h>
  83  #include <linux/lockdep.h>
  84 -#include <linux/minmax.h>
  85  #include <linux/netdevice.h>
  86  #include <linux/skbuff.h>
  87  #include <linux/slab.h>
  88 diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
  89 index 0f186ddc15e30a9c9f5e4de44b96b2c7b27d8b86..b57e95c959cf064a74a01d25a24bdc495caa6324 100644
  90 --- a/net/batman-adv/hard-interface.c
  91 +++ b/net/batman-adv/hard-interface.c
  92 @@ -18,7 +18,6 @@
  93  #include <linux/kref.h>
  94  #include <linux/limits.h>
  95  #include <linux/list.h>
  96 -#include <linux/minmax.h>
  97  #include <linux/mutex.h>
  98  #include <linux/netdevice.h>
  99  #include <linux/printk.h>
 100 diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
 101 index ed9d87ce3407614e5e37922fe3039324adb027cc..edc0d53e9ba0a79ad0c37986e15ec362fb009f4f 100644
 102 --- a/net/batman-adv/main.c
 103 +++ b/net/batman-adv/main.c
 104 @@ -23,7 +23,6 @@
 105  #include <linux/kobject.h>
 106  #include <linux/kref.h>
 107  #include <linux/list.h>
 108 -#include <linux/minmax.h>
 109  #include <linux/module.h>
 110  #include <linux/netdevice.h>
 111  #include <linux/printk.h>
 112 diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
 113 index a8f15c04826af1144db655887b754758fc5ab47a..dc193618a761c0b451e860ca83921007d286e09b 100644
 114 --- a/net/batman-adv/netlink.c
 115 +++ b/net/batman-adv/netlink.c
 116 @@ -23,7 +23,6 @@
 117  #include <linux/kernel.h>
 118  #include <linux/limits.h>
 119  #include <linux/list.h>
 120 -#include <linux/minmax.h>
 121  #include <linux/netdevice.h>
 122  #include <linux/netlink.h>
 123  #include <linux/printk.h>
 124 diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
 125 index d4e10005df6cd2936a3132e1ad7bd8bf3c1d99b6..db7e3774825b5f5871b23c0e4fa5ce7afb2accd6 100644
 126 --- a/net/batman-adv/tp_meter.c
 127 +++ b/net/batman-adv/tp_meter.c
 128 @@ -23,7 +23,6 @@
 129  #include <linux/kthread.h>
 130  #include <linux/limits.h>
 131  #include <linux/list.h>
 132 -#include <linux/minmax.h>
 133  #include <linux/netdevice.h>
 134  #include <linux/param.h>
 135  #include <linux/printk.h>