batman-adv: Switch to linux/sprintf.h
Sven Eckelmann
maintainerPATCH v2 1/1 batman-adv: Switch to linux/sprintf.h
The commit 39ced19b9e60 ("lib/vsprintf: split out sprintf() and friends") introduced a new header for the sprintf related functions which were previously exposed via linux/kernel.h.
Signed-off-by Sven Eckelmann <[email protected]>
---
Changes in v2:
- version for out-of-tree kernel with compat header
- Link to v1: https://lore.kernel.org/r/[email protected]
--- compat-include/linux/sprintf.h | 20 ++++++++++++++++++++ net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/gateway_client.c | 2 +- net/batman-adv/main.c | 1 + net/batman-adv/multicast.c | 2 +- 5 files changed, 24 insertions(+), 3 deletions(-)
compat-include/linux/sprintf.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) B.A.T.M.A.N. contributors: +* +* Marek Lindner, Simon Wunderlich +* +* This file contains macros for maintaining compatibility with older versions +* of the Linux kernel. +*/ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_SPRINTF_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_SPRINTF_H_ + +#include <linux/version.h> +#if LINUX_VERSION_IS_GEQ (6 ,6 ,0 ) +#include_next <linux/sprintf.h> +#else +#include <linux/kernel.h> +#endif + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_SPRINTF_H_ */
net/batman-adv/bridge_loop_avoidance.c +1 -1
@@ -20,7 +20,6 @@#include <linux/if_vlan.h> #include <linux/jhash.h> #include <linux/jiffies.h> -#include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> #include <linux/lockdep.h>
@@ -31,6 +30,7 @@#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/sprintf.h> #include <linux/stddef.h> #include <linux/string.h> #include <linux/workqueue.h>
net/batman-adv/gateway_client.c +1 -1
@@ -18,7 +18,6 @@#include <linux/in.h> #include <linux/ip.h> #include <linux/ipv6.h> -#include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> #include <linux/lockdep.h>
@@ -29,6 +28,7 @@#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/sprintf.h> #include <linux/stddef.h> #include <linux/udp.h> #include <net/sock.h>
net/batman-adv/main.c +1 -0
@@ -33,6 +33,7 @@#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/sprintf.h> #include <linux/stddef.h> #include <linux/string.h> #include <linux/workqueue.h>
net/batman-adv/multicast.c +1 -1
@@ -25,7 +25,6 @@#include <linux/ip.h> #include <linux/ipv6.h> #include <linux/jiffies.h> -#include <linux/kernel.h> #include <linux/list.h> #include <linux/lockdep.h> #include <linux/netdevice.h>
@@ -36,6 +35,7 @@#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/sprintf.h> #include <linux/stddef.h> #include <linux/string.h> #include <linux/types.h>
---
base-commit: 5fecd4a389cea1b9719e9ec480d7257887e0dfdf
change-id: 20231030-sprintf_header-47d656369468
Best regards,
Signature · 1 line
Sven Eckelmann <[email protected]>