Commit 4ab408de authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: fix protocol sk_buff field

Commit e992cd9b (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 14d18a81


(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: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 85b35269
...@@ -355,8 +355,8 @@ struct sk_buff { ...@@ -355,8 +355,8 @@ struct sk_buff {
ipvs_property:1, ipvs_property:1,
peeked:1, peeked:1,
nf_trace:1; nf_trace:1;
__be16 protocol:16;
kmemcheck_bitfield_end(flags1); kmemcheck_bitfield_end(flags1);
__be16 protocol;
void (*destructor)(struct sk_buff *skb); void (*destructor)(struct sk_buff *skb);
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment