Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / include / net / inet_timewait_sock.h

diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index 71c6e26..61474ea 100644 (file)
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -133,9 +133,9 @@ struct inet_timewait_sock {
        /* And these are ours. */
        unsigned int            tw_ipv6only     : 1,
                                tw_transparent  : 1,
-                               tw_pad          : 6,    /* 6 bits hole */
-                               tw_tos          : 8,
-                               tw_pad2         : 16;   /* 16 bits hole */
+                               tw_flowlabel    : 20,
+                               tw_pad          : 2,    /* 2 bits hole */
+                               tw_tos          : 8;
        kmemcheck_bitfield_end(flags);
        u32                     tw_ttd;
        struct inet_bind_bucket *tw_tb;