batman-adv/patches/0001-Revert-batman-adv-Migrate-to-linux-container_of.h.patch

   1 From: Sven Eckelmann <sven@narfation.org>
   2 Date: Fri, 6 May 2022 22:03:29 +0200
   3 Subject: Revert "batman-adv: Migrate to linux/container_of.h"
   4
   5 The original patch requires Linux 5.16.0 or a mac80211 compat header with this
   6 name. But the mac80211 package is currently not providing this header and
   7 OpenWrt main is still using older Linux kernel versions for some targets.
   8
   9 This reverts commit 043ae5634bdfd4c4dd8b95a22890752495080bb5.
  10
  11 --- a/compat-include/linux/container_of.h
  12 +++ /dev/null
  13 @@ -1,20 +0,0 @@
  14 -/* SPDX-License-Identifier: GPL-2.0 */
  15 -/* Copyright (C) B.A.T.M.A.N. contributors:
  16 - *
  17 - * Marek Lindner, Simon Wunderlich
  18 - *
  19 - * This file contains macros for maintaining compatibility with older versions
  20 - * of the Linux kernel.
  21 - */
  22 -
  23 -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_CONTAINER_OF_H_
  24 -#define _NET_BATMAN_ADV_COMPAT_LINUX_CONTAINER_OF_H_
  25 -
  26 -#include <linux/version.h>
  27 -#if LINUX_VERSION_IS_GEQ(5, 16, 0)
  28 -#include_next <linux/container_of.h>
  29 -#else
  30 -#include <linux/kernel.h>
  31 -#endif
  32 -
  33 -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_CONTAINER_OF_H_ */
  34 --- a/net/batman-adv/bat_iv_ogm.c
  35 +++ b/net/batman-adv/bat_iv_ogm.c
  36 @@ -13,13 +13,13 @@
  37  #include <linux/bug.h>
  38  #include <linux/byteorder/generic.h>
  39  #include <linux/cache.h>
  40 -#include <linux/container_of.h>
  41  #include <linux/errno.h>
  42  #include <linux/etherdevice.h>
  43  #include <linux/gfp.h>
  44  #include <linux/if_ether.h>
  45  #include <linux/init.h>
  46  #include <linux/jiffies.h>
  47 +#include <linux/kernel.h>
  48  #include <linux/kref.h>
  49  #include <linux/list.h>
  50  #include <linux/lockdep.h>
  51 --- a/net/batman-adv/bat_v_elp.c
  52 +++ b/net/batman-adv/bat_v_elp.c
  53 @@ -10,13 +10,13 @@
  54  #include <linux/atomic.h>
  55  #include <linux/bitops.h>
  56  #include <linux/byteorder/generic.h>
  57 -#include <linux/container_of.h>
  58  #include <linux/errno.h>
  59  #include <linux/etherdevice.h>
  60  #include <linux/ethtool.h>
  61  #include <linux/gfp.h>
  62  #include <linux/if_ether.h>
  63  #include <linux/jiffies.h>
  64 +#include <linux/kernel.h>
  65  #include <linux/kref.h>
  66  #include <linux/minmax.h>
  67  #include <linux/netdevice.h>
  68 --- a/net/batman-adv/bat_v_ogm.c
  69 +++ b/net/batman-adv/bat_v_ogm.c
  70 @@ -9,12 +9,12 @@
  71
  72  #include <linux/atomic.h>
  73  #include <linux/byteorder/generic.h>
  74 -#include <linux/container_of.h>
  75  #include <linux/errno.h>
  76  #include <linux/etherdevice.h>
  77  #include <linux/gfp.h>
  78  #include <linux/if_ether.h>
  79  #include <linux/jiffies.h>
  80 +#include <linux/kernel.h>
  81  #include <linux/kref.h>
  82  #include <linux/list.h>
  83  #include <linux/lockdep.h>
  84 --- a/net/batman-adv/bridge_loop_avoidance.c
  85 +++ b/net/batman-adv/bridge_loop_avoidance.c
  86 @@ -10,7 +10,6 @@
  87  #include <linux/atomic.h>
  88  #include <linux/byteorder/generic.h>
  89  #include <linux/compiler.h>
  90 -#include <linux/container_of.h>
  91  #include <linux/crc16.h>
  92  #include <linux/errno.h>
  93  #include <linux/etherdevice.h>
  94 --- a/net/batman-adv/distributed-arp-table.c
  95 +++ b/net/batman-adv/distributed-arp-table.c
  96 @@ -11,7 +11,6 @@
  97  #include <linux/atomic.h>
  98  #include <linux/bitops.h>
  99  #include <linux/byteorder/generic.h>
 100 -#include <linux/container_of.h>
 101  #include <linux/errno.h>
 102  #include <linux/etherdevice.h>
 103  #include <linux/gfp.h>
 104 @@ -21,6 +20,7 @@
 105  #include <linux/in.h>
 106  #include <linux/ip.h>
 107  #include <linux/jiffies.h>
 108 +#include <linux/kernel.h>
 109  #include <linux/kref.h>
 110  #include <linux/list.h>
 111  #include <linux/netlink.h>
 112 --- a/net/batman-adv/gateway_client.c
 113 +++ b/net/batman-adv/gateway_client.c
 114 @@ -9,7 +9,6 @@
 115
 116  #include <linux/atomic.h>
 117  #include <linux/byteorder/generic.h>
 118 -#include <linux/container_of.h>
 119  #include <linux/errno.h>
 120  #include <linux/etherdevice.h>
 121  #include <linux/gfp.h>
 122 --- a/net/batman-adv/hard-interface.c
 123 +++ b/net/batman-adv/hard-interface.c
 124 @@ -10,12 +10,12 @@
 125  #include <linux/atomic.h>
 126  #include <linux/byteorder/generic.h>
 127  #include <linux/compiler.h>
 128 -#include <linux/container_of.h>
 129  #include <linux/errno.h>
 130  #include <linux/gfp.h>
 131  #include <linux/if.h>
 132  #include <linux/if_arp.h>
 133  #include <linux/if_ether.h>
 134 +#include <linux/kernel.h>
 135  #include <linux/kref.h>
 136  #include <linux/limits.h>
 137  #include <linux/list.h>
 138 --- a/net/batman-adv/main.c
 139 +++ b/net/batman-adv/main.c
 140 @@ -10,7 +10,6 @@
 141  #include <linux/atomic.h>
 142  #include <linux/build_bug.h>
 143  #include <linux/byteorder/generic.h>
 144 -#include <linux/container_of.h>
 145  #include <linux/crc32c.h>
 146  #include <linux/device.h>
 147  #include <linux/errno.h>
 148 --- a/net/batman-adv/multicast.c
 149 +++ b/net/batman-adv/multicast.c
 150 @@ -11,7 +11,6 @@
 151  #include <linux/bitops.h>
 152  #include <linux/bug.h>
 153  #include <linux/byteorder/generic.h>
 154 -#include <linux/container_of.h>
 155  #include <linux/errno.h>
 156  #include <linux/etherdevice.h>
 157  #include <linux/gfp.h>
 158 --- a/net/batman-adv/network-coding.c
 159 +++ b/net/batman-adv/network-coding.c
 160 @@ -11,7 +11,6 @@
 161  #include <linux/bitops.h>
 162  #include <linux/byteorder/generic.h>
 163  #include <linux/compiler.h>
 164 -#include <linux/container_of.h>
 165  #include <linux/errno.h>
 166  #include <linux/etherdevice.h>
 167  #include <linux/gfp.h>
 168 @@ -20,6 +19,7 @@
 169  #include <linux/init.h>
 170  #include <linux/jhash.h>
 171  #include <linux/jiffies.h>
 172 +#include <linux/kernel.h>
 173  #include <linux/kref.h>
 174  #include <linux/list.h>
 175  #include <linux/lockdep.h>
 176 --- a/net/batman-adv/originator.c
 177 +++ b/net/batman-adv/originator.c
 178 @@ -8,11 +8,11 @@
 179  #include "main.h"
 180
 181  #include <linux/atomic.h>
 182 -#include <linux/container_of.h>
 183  #include <linux/errno.h>
 184  #include <linux/etherdevice.h>
 185  #include <linux/gfp.h>
 186  #include <linux/jiffies.h>
 187 +#include <linux/kernel.h>
 188  #include <linux/kref.h>
 189  #include <linux/list.h>
 190  #include <linux/lockdep.h>
 191 --- a/net/batman-adv/send.c
 192 +++ b/net/batman-adv/send.c
 193 @@ -10,13 +10,13 @@
 194  #include <linux/atomic.h>
 195  #include <linux/bug.h>
 196  #include <linux/byteorder/generic.h>
 197 -#include <linux/container_of.h>
 198  #include <linux/errno.h>
 199  #include <linux/etherdevice.h>
 200  #include <linux/gfp.h>
 201  #include <linux/if.h>
 202  #include <linux/if_ether.h>
 203  #include <linux/jiffies.h>
 204 +#include <linux/kernel.h>
 205  #include <linux/kref.h>
 206  #include <linux/list.h>
 207  #include <linux/netdevice.h>
 208 --- a/net/batman-adv/soft-interface.c
 209 +++ b/net/batman-adv/soft-interface.c
 210 @@ -11,7 +11,6 @@
 211  #include <linux/byteorder/generic.h>
 212  #include <linux/cache.h>
 213  #include <linux/compiler.h>
 214 -#include <linux/container_of.h>
 215  #include <linux/cpumask.h>
 216  #include <linux/errno.h>
 217  #include <linux/etherdevice.h>
 218 @@ -20,6 +19,7 @@
 219  #include <linux/if_ether.h>
 220  #include <linux/if_vlan.h>
 221  #include <linux/jiffies.h>
 222 +#include <linux/kernel.h>
 223  #include <linux/kref.h>
 224  #include <linux/list.h>
 225  #include <linux/lockdep.h>
 226 --- a/net/batman-adv/tp_meter.c
 227 +++ b/net/batman-adv/tp_meter.c
 228 @@ -12,13 +12,13 @@
 229  #include <linux/byteorder/generic.h>
 230  #include <linux/cache.h>
 231  #include <linux/compiler.h>
 232 -#include <linux/container_of.h>
 233  #include <linux/err.h>
 234  #include <linux/etherdevice.h>
 235  #include <linux/gfp.h>
 236  #include <linux/if_ether.h>
 237  #include <linux/init.h>
 238  #include <linux/jiffies.h>
 239 +#include <linux/kernel.h>
 240  #include <linux/kref.h>
 241  #include <linux/kthread.h>
 242  #include <linux/limits.h>
 243 --- a/net/batman-adv/translation-table.c
 244 +++ b/net/batman-adv/translation-table.c
 245 @@ -13,7 +13,6 @@
 246  #include <linux/byteorder/generic.h>
 247  #include <linux/cache.h>
 248  #include <linux/compiler.h>
 249 -#include <linux/container_of.h>
 250  #include <linux/crc32c.h>
 251  #include <linux/errno.h>
 252  #include <linux/etherdevice.h>
 253 @@ -22,6 +21,7 @@
 254  #include <linux/init.h>
 255  #include <linux/jhash.h>
 256  #include <linux/jiffies.h>
 257 +#include <linux/kernel.h>
 258  #include <linux/kref.h>
 259  #include <linux/list.h>
 260  #include <linux/lockdep.h>
 261 --- a/net/batman-adv/tvlv.c
 262 +++ b/net/batman-adv/tvlv.c
 263 @@ -7,10 +7,10 @@
 264  #include "main.h"
 265
 266  #include <linux/byteorder/generic.h>
 267 -#include <linux/container_of.h>
 268  #include <linux/etherdevice.h>
 269  #include <linux/gfp.h>
 270  #include <linux/if_ether.h>
 271 +#include <linux/kernel.h>
 272  #include <linux/kref.h>
 273  #include <linux/list.h>
 274  #include <linux/lockdep.h>