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

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

net: Fix struct inet_timewait_sock bitfield annotation 



commit 9e337b0f (net: annotate inet_timewait_sock bitfields)
added 4/8 bytes in struct inet_timewait_sock.

Fix this by declaring tw_ipv6_offset in the 'flags' bitfield
The 14 bits hole is named tw_pad to make it cleary apparent.

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

include/net/inet_timewait_sock.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -130,11 +130,11 @@ struct inet_timewait_sock { 
	__u16			tw_num;

	__u16			tw_num;

	kmemcheck_bitfield_begin(flags);

	kmemcheck_bitfield_begin(flags);

	/* And these are ours. */

	/* And these are ours. */

	__u8			tw_ipv6only:1,

	unsigned int		tw_ipv6only     : 1,

				tw_transparent:1;

				tw_transparent  : 1,

	/* 14 bits hole, try to pack */

				tw_pad		: 14,	/* 14 bits hole */

				tw_ipv6_offset  : 16;

	kmemcheck_bitfield_end(flags);

	kmemcheck_bitfield_end(flags);

	__u16			tw_ipv6_offset;

	unsigned long		tw_ttd;

	unsigned long		tw_ttd;

	struct inet_bind_bucket	*tw_tb;

	struct inet_bind_bucket	*tw_tb;

	struct hlist_node	tw_death_node;

	struct hlist_node	tw_death_node;