diff options
| author | Vegard Nossum <vegard.nossum@gmail.com> | 2008-10-18 11:37:51 -0400 |
|---|---|---|
| committer | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 09:49:32 -0400 |
| commit | 9e337b0fb3baa3c22490365b1bdee6f4741413d4 (patch) | |
| tree | bba282e16e73c7e911e1a83ffe249a0ae05b4f1d /include | |
| parent | 96c25c81ecf452b778e2f432bd17c95de637d129 (diff) | |
net: annotate inet_timewait_sock bitfields
The use of bitfields here would lead to false positive warnings with
kmemcheck. Silence them.
(Additionally, one erroneous comment related to the bitfield was also
fixed.)
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/inet_timewait_sock.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h index 4b8ece22b8e9..b63b80fac567 100644 --- a/include/net/inet_timewait_sock.h +++ b/include/net/inet_timewait_sock.h | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #define _INET_TIMEWAIT_SOCK_ | 16 | #define _INET_TIMEWAIT_SOCK_ |
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | #include <linux/kmemcheck.h> | ||
| 19 | #include <linux/list.h> | 20 | #include <linux/list.h> |
| 20 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 21 | #include <linux/timer.h> | 22 | #include <linux/timer.h> |
| @@ -127,10 +128,12 @@ struct inet_timewait_sock { | |||
| 127 | __be32 tw_rcv_saddr; | 128 | __be32 tw_rcv_saddr; |
| 128 | __be16 tw_dport; | 129 | __be16 tw_dport; |
| 129 | __u16 tw_num; | 130 | __u16 tw_num; |
| 131 | kmemcheck_bitfield_begin(flags); | ||
| 130 | /* And these are ours. */ | 132 | /* And these are ours. */ |
| 131 | __u8 tw_ipv6only:1, | 133 | __u8 tw_ipv6only:1, |
| 132 | tw_transparent:1; | 134 | tw_transparent:1; |
| 133 | /* 15 bits hole, try to pack */ | 135 | /* 14 bits hole, try to pack */ |
| 136 | kmemcheck_bitfield_end(flags); | ||
| 134 | __u16 tw_ipv6_offset; | 137 | __u16 tw_ipv6_offset; |
| 135 | unsigned long tw_ttd; | 138 | unsigned long tw_ttd; |
| 136 | struct inet_bind_bucket *tw_tb; | 139 | struct inet_bind_bucket *tw_tb; |
