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 9b7269e8a760361c1650b947c77702f0bdcd73d9..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) 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 e1ca2b8c315235f234c9061fc73cde2c1b76aa46..eeb3f6d00d8541b377c9703837ef76b05e8d061e 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 423c2d17170387bfe89b83c4e20f06d525a36b30..4d8e3fdb4427a431cab903bc8a20edb816079fd7 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 a0a9636d17406362f879f342300a18e75424efa5..89ba88322c9c11acc49a9dcd9877ad8767fe713b 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 a5d9d800082bade3a1d52cc040557e41f963fac3..96873d47fac5cb9b4fbfa217eedf1f92818b0e98 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 4a6a25d551a83b1723e80a349e1a655a2152b0ac..eabde547d308438257622879e77d84c24daa2199 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 3ddd66e4c29ef532de33c7182cc0cc470b33fd4f..c552bc4168d0abd7bf6d23e570d583806fb162b1 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 bdac5dbd899a9540d58052fd32c8c89520927390..b6a703ddd8e97e6a02e8d73c5728802f090ab419 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 789c851732b78ad9d1515f7b171219cc770c7045..46b774c08c947def8f72f260224254b01c3a387d 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>