---

yaml --- r: 184599 b: refs/heads/master c: 4ab408d h: refs/heads/master i: 184597: f9614ec 184595: 7cc1b7e 184591: 5b97cb1 v: v3
git-mirror · Mar 2, 2010 · 048bbe0 · 048bbe0
1 parent 9350e12
commit 048bbe0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)