batman-adv/patches/0003-Revert-batman-adv-Switch-to-linux-sprintf.h.patch

   1 From: Sven Eckelmann <sven@narfation.org>
   2 Date: Fri, 2 Feb 2024 22:49:00 +0100
   3 Subject: Revert "batman-adv: Switch to linux/sprintf.h"
   4
   5 The original patch requires Linux 6.6.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 f0fb49c5ab70dfa064f0aa8d1c5d84f65e8cbc86.
  10
  11 --- a/compat-include/linux/sprintf.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_SPRINTF_H_
  24 -#define _NET_BATMAN_ADV_COMPAT_LINUX_SPRINTF_H_
  25 -
  26 -#include <linux/version.h>
  27 -#if LINUX_VERSION_IS_GEQ(6, 6, 0)
  28 -#include_next <linux/sprintf.h>
  29 -#else
  30 -#include <linux/kernel.h>
  31 -#endif
  32 -
  33 -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_SPRINTF_H_ */
  34 --- a/net/batman-adv/bridge_loop_avoidance.c
  35 +++ b/net/batman-adv/bridge_loop_avoidance.c
  36 @@ -19,6 +19,7 @@
  37  #include <linux/if_vlan.h>
  38  #include <linux/jhash.h>
  39  #include <linux/jiffies.h>
  40 +#include <linux/kernel.h>
  41  #include <linux/kref.h>
  42  #include <linux/list.h>
  43  #include <linux/lockdep.h>
  44 @@ -29,7 +30,6 @@
  45  #include <linux/skbuff.h>
  46  #include <linux/slab.h>
  47  #include <linux/spinlock.h>
  48 -#include <linux/sprintf.h>
  49  #include <linux/stddef.h>
  50  #include <linux/string.h>
  51  #include <linux/workqueue.h>
  52 --- a/net/batman-adv/gateway_client.c
  53 +++ b/net/batman-adv/gateway_client.c
  54 @@ -17,6 +17,7 @@
  55  #include <linux/in.h>
  56  #include <linux/ip.h>
  57  #include <linux/ipv6.h>
  58 +#include <linux/kernel.h>
  59  #include <linux/kref.h>
  60  #include <linux/list.h>
  61  #include <linux/lockdep.h>
  62 @@ -27,7 +28,6 @@
  63  #include <linux/skbuff.h>
  64  #include <linux/slab.h>
  65  #include <linux/spinlock.h>
  66 -#include <linux/sprintf.h>
  67  #include <linux/stddef.h>
  68  #include <linux/udp.h>
  69  #include <net/sock.h>
  70 --- a/net/batman-adv/main.c
  71 +++ b/net/batman-adv/main.c
  72 @@ -32,7 +32,6 @@
  73  #include <linux/skbuff.h>
  74  #include <linux/slab.h>
  75  #include <linux/spinlock.h>
  76 -#include <linux/sprintf.h>
  77  #include <linux/stddef.h>
  78  #include <linux/string.h>
  79  #include <linux/workqueue.h>
  80 --- a/net/batman-adv/multicast.c
  81 +++ b/net/batman-adv/multicast.c
  82 @@ -24,6 +24,7 @@
  83  #include <linux/ip.h>
  84  #include <linux/ipv6.h>
  85  #include <linux/jiffies.h>
  86 +#include <linux/kernel.h>
  87  #include <linux/list.h>
  88  #include <linux/lockdep.h>
  89  #include <linux/netdevice.h>
  90 @@ -34,7 +35,6 @@
  91  #include <linux/skbuff.h>
  92  #include <linux/slab.h>
  93  #include <linux/spinlock.h>
  94 -#include <linux/sprintf.h>
  95  #include <linux/stddef.h>
  96  #include <linux/string.h>
  97  #include <linux/types.h>