diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-10-18 22:48:51 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-20 01:13:26 -0700 |
| commit | abf90cca9725bd05362fb3443ad55071a69a12d9 (patch) | |
| tree | 4bf6b9ded03dd0a7489bd143f7f40cc445ea034b /include | |
| parent | b6b39e8f3fbbb31001b836afec87bcaf4811a7bf (diff) | |
| download | op-kernel-dev-abf90cca9725bd05362fb3443ad55071a69a12d9.zip op-kernel-dev-abf90cca9725bd05362fb3443ad55071a69a12d9.tar.gz | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/inet_timewait_sock.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h index b63b80f..f93ad90 100644 --- a/include/net/inet_timewait_sock.h +++ b/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; |
