Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14d18a81 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: fix kmemcheck annotations 



struct sk_buff kmemcheck annotations enlarged this structure by 8/16 bytes

Fix this by moving 'protocol' inside flags1 bitfield,
and queue_mapping inside flags2 bitfield.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d5846b9

include/linux/skbuff.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -354,8 +354,8 @@ struct sk_buff { 
				ipvs_property:1,

				ipvs_property:1,

				peeked:1,

				peeked:1,

				nf_trace:1;

				nf_trace:1;

	__be16			protocol:16;

	kmemcheck_bitfield_end(flags1);

	kmemcheck_bitfield_end(flags1);

	__be16			protocol;





	void			(*destructor)(struct sk_buff *skb);

	void			(*destructor)(struct sk_buff *skb);

#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
@@ -367,7 +367,6 @@ struct sk_buff { 
#endif

#endif





	int			iif;

	int			iif;

	__u16			queue_mapping;

#ifdef CONFIG_NET_SCHED

#ifdef CONFIG_NET_SCHED

	__u16			tc_index;	/* traffic control index */

	__u16			tc_index;	/* traffic control index */

#ifdef CONFIG_NET_CLS_ACT

#ifdef CONFIG_NET_CLS_ACT
@@ -376,6 +375,7 @@ struct sk_buff { 
#endif

#endif





	kmemcheck_bitfield_begin(flags2);

	kmemcheck_bitfield_begin(flags2);

	__u16			queue_mapping:16;

#ifdef CONFIG_IPV6_NDISC_NODETYPE

#ifdef CONFIG_IPV6_NDISC_NODETYPE

	__u8			ndisc_nodetype:2;

	__u8			ndisc_nodetype:2;

#endif

#endif