From 048bbe0403207b3739a10ffa824ea6a0e667bd51 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 1 Mar 2010 03:09:26 +0000 Subject: [PATCH] --- yaml --- r: 184599 b: refs/heads/master c: 4ab408dea0f0dba4dec0555f4f35b7ae703f5e91 h: refs/heads/master i: 184597: f9614ecec2c5af8896ea7ac67f6ff9cf8ade68f7 184595: 7cc1b7e91a3ceb0be3b17baa58af06d891baa28a 184591: 5b97cb136496967e80e7c0e6634d14ee099485f9 v: v3 --- [refs] | 2 +- trunk/include/linux/skbuff.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ca1d220eb586..9e1b0d7a0f74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85b3526932645269f67fee3583fa2aa500ab4f34 +refs/heads/master: 4ab408dea0f0dba4dec0555f4f35b7ae703f5e91 diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index d266eeef522d..03f816a9b659 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/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)