batman-adv: Replace FIELD_SIZEOF with sizeof_field
Sven Eckelmann
maintainerPATCH 1/1 batman-adv: Replace FIELD_SIZEOF with sizeof_field
The prefered way of getting the size of a member of a struct is the common macro sizeof_field from stddef.h and not the FIELD_SIZEOF (with multiple definitions).
Signed-off-by Sven Eckelmann <[email protected]>
--- compat-include/linux/stddef.h | 24 ++++++++++++++++++++++++ net/batman-adv/main.c | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 compat-include/linux/stddef.h
compat-include/linux/stddef.h new file +24 -0
@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2007-2019 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_STDDEF_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_ + +#include <linux/version.h> +#include_next <linux/stddef.h> + +#if LINUX_VERSION_CODE <KERNEL_VERSION (4 ,16 ,0 ) + +#ifndef sizeof_field +#define sizeof_field (TYPE ,MEMBER ) sizeof((((TYPE *)0)->MEMBER)) +#endif + +#endif /* < KERNEL_VERSION(4, 16, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_ */
net/batman-adv/main.c +1 -1
@@ -548,7 +548,7 @@ static void batadv_recv_handler_init(void)BUILD_BUG_ON (sizeof (struct batadv_tvlv_tt_change ) !=12 );BUILD_BUG_ON (sizeof (struct batadv_tvlv_roam_adv ) !=8 ); - i = FIELD_SIZEOF(struct sk_buff, cb); + i = sizeof_field(struct sk_buff, cb);BUILD_BUG_ON (sizeof (struct batadv_skb_cb ) > i);/* broadcast packet */
Signature · 1 line
2.20.1