From 867fd1e1d2450d260e95c18ad21af2654300cbeb Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 18 Oct 2009 22:48:51 +0000
Subject: [PATCH] --- yaml --- r: 167707 b: refs/heads/master c:
 abf90cca9725bd05362fb3443ad55071a69a12d9 h: refs/heads/master i:   167705:
 98aab0c5d4dbda2659566a636bea590ff02e1e3d   167703:
 db8a90d8301d7ee13b61af24af1ef64623d39c9e v: v3

---
 [refs]                                 | 2 +-
 trunk/include/net/inet_timewait_sock.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a28921f275e1..a58932407f13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6b39e8f3fbbb31001b836afec87bcaf4811a7bf
+refs/heads/master: abf90cca9725bd05362fb3443ad55071a69a12d9
diff --git a/trunk/include/net/inet_timewait_sock.h b/trunk/include/net/inet_timewait_sock.h
index b63b80fac567..f93ad90a601b 100644
--- a/trunk/include/net/inet_timewait_sock.h
+++ b/trunk/include/net/inet_timewait_sock.h
@@ -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;