Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit abf90cca9725bd05362fb3443ad55071a69a12d9

Authored by Eric Dumazet
Committed by David S. Miller
1 parent b6b39e8f3f
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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 <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

include/net/inet_timewait_sock.h
Diff comments   View file @ abf90cc
... ... @@ -130,11 +130,11 @@
130 130 __u16 tw_num;
131 131 kmemcheck_bitfield_begin(flags);
132 132 /* And these are ours. */
133   - __u8 tw_ipv6only:1,
134   - tw_transparent:1;
135   - /* 14 bits hole, try to pack */
  133 + unsigned int tw_ipv6only : 1,
  134 + tw_transparent : 1,
  135 + tw_pad : 14, /* 14 bits hole */
  136 + tw_ipv6_offset : 16;
136 137 kmemcheck_bitfield_end(flags);
137   - __u16 tw_ipv6_offset;
138 138 unsigned long tw_ttd;
139 139 struct inet_bind_bucket *tw_tb;
140 140 struct hlist_node tw_death_node;