net: Fix struct inet_timewait_sock bitfield annotation

PATCH Applied Eric Dumazet 2 participants 2 messages Oct 19, 2009 – Oct 20, 2009

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Eric Dumazet

author

2009-10-19 08:48 UTC #0 lore raw

PATCH 1/1 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 Eric Dumazet <[email protected]>

---

include/net/inet_timewait_sock.h +4 -4

index 37f3aea..b5ad469 100644
@@ -130,11 +130,11 @@ struct inet_timewait_sock {
 	__u16			tw_num;
 	kmemcheck_bitfield_begin(flags);
 	/* And these are ours. */
-	__u8			tw_ipv6only:1,
-				tw_transparent:1;
-	/* 14 bits hole, try to pack */
+	unsigned int		tw_ipv6only     : 1,
+				tw_transparent  : 1,
+				tw_pad		: 14,	/* 14 bits hole */
+				tw_ipv6_offset  : 16;
 	kmemcheck_bitfield_end(flags);
-	__u16			tw_ipv6_offset;
 	unsigned long		tw_ttd;
 	struct inet_bind_bucket	*tw_tb;
 	struct hlist_node	tw_death_node;

David Miller

maintainer Applied

2009-10-20 08:14 UTC #1 lore raw

From: Eric Dumazet <[email protected]>
Date: Mon, 19 Oct 2009 10:48:51 +0200

Quoted 7 lines

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 Eric Dumazet <[email protected]>

Applied to net-2.6, thanks.