batman-adv/patches/0004-Revert-batman-adv-Switch-to-linux-array_size.h.patch

   1 From: Sven Eckelmann <sven@narfation.org>
   2 Date: Fri, 2 Feb 2024 22:49:48 +0100
   3 Subject: Revert "batman-adv: Switch to linux/array_size.h"
   4
   5 The original patch requires Linux 6.7.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 f33d7f724675544a36b24c77f8d4b95d41252ae2.
  10
  11 --- a/compat-include/linux/array_size.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_ARRAY_SIZE_H_
  24 -#define _NET_BATMAN_ADV_COMPAT_LINUX_ARRAY_SIZE_H_
  25 -
  26 -#include <linux/version.h>
  27 -#if LINUX_VERSION_IS_GEQ(6, 7, 0)
  28 -#include_next <linux/array_size.h>
  29 -#else
  30 -#include <linux/kernel.h>
  31 -#endif
  32 -
  33 -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_ARRAY_SIZE_H_ */
  34 --- a/net/batman-adv/main.c
  35 +++ b/net/batman-adv/main.c
  36 @@ -6,7 +6,6 @@
  37
  38  #include "main.h"
  39
  40 -#include <linux/array_size.h>
  41  #include <linux/atomic.h>
  42  #include <linux/build_bug.h>
  43  #include <linux/byteorder/generic.h>
  44 @@ -20,6 +19,7 @@
  45  #include <linux/init.h>
  46  #include <linux/ip.h>
  47  #include <linux/ipv6.h>
  48 +#include <linux/kernel.h>
  49  #include <linux/kobject.h>
  50  #include <linux/kref.h>
  51  #include <linux/list.h>
  52 --- a/net/batman-adv/netlink.c
  53 +++ b/net/batman-adv/netlink.c
  54 @@ -7,7 +7,6 @@
  55  #include "netlink.h"
  56  #include "main.h"
  57
  58 -#include <linux/array_size.h>
  59  #include <linux/atomic.h>
  60  #include <linux/bitops.h>
  61  #include <linux/bug.h>
  62 @@ -20,6 +19,7 @@
  63  #include <linux/if_ether.h>
  64  #include <linux/if_vlan.h>
  65  #include <linux/init.h>
  66 +#include <linux/kernel.h>
  67  #include <linux/limits.h>
  68  #include <linux/list.h>
  69  #include <linux/minmax.h>