diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-03-01 06:09:26 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-02 14:05:05 +0300 |
| commit | 4ab408dea0f0dba4dec0555f4f35b7ae703f5e91 (patch) | |
| tree | 9bb765972530c87a9f010d45f63027c607864b76 /include/linux | |
| parent | 85b3526932645269f67fee3583fa2aa500ab4f34 (diff) | |
| download | linux-4ab408dea0f0dba4dec0555f4f35b7ae703f5e91.tar.xz | |
net: fix protocol sk_buff field
Commit e992cd9b72a18 (kmemcheck: make bitfield annotations truly no-ops
when disabled) allows us to revert a workaround we did in the past to
not add holes in sk_buff structure.
This patch partially reverts commit 14d18a81b5171
(net: fix kmemcheck annotations) so that sparse doesnt complain:
include/linux/skbuff.h:357:41: error: invalid bitfield specifier for
type restricted __be16.
Reported-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/skbuff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index d266eeef522d..03f816a9b659 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -355,8 +355,8 @@ struct sk_buff { ipvs_property:1, peeked:1, nf_trace:1; - __be16 protocol:16; kmemcheck_bitfield_end(flags1); + __be16 protocol; void (*destructor)(struct sk_buff *skb); #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) |