---

yaml --- r: 14572 b: refs/heads/master c: b84f4cc h: refs/heads/master v: v3
git-mirror · Nov 21, 2005 · b701ac4 · b701ac4
1 parent 7bb5d9f
commit b701ac4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a516b04950f62d36b33db00c0d3c69d09dae99a9
+refs/heads/master: b84f4cc977ec4a1260dc8d9165efc9319a93c2a2
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
@@ -264,16 +264,14 @@ struct sk_buff {
 				nohdr:1,
 				nfctinfo:3;
 	__u8			pkt_type:3,
-				fclone:2;
+				fclone:2,
+				ipvs_property:1;
 	__be16			protocol;
 
 	void			(*destructor)(struct sk_buff *skb);
 #ifdef CONFIG_NETFILTER
 	__u32			nfmark;
 	struct nf_conntrack	*nfct;
-#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
-	__u8			ipvs_property:1;
-#endif
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
 	struct sk_buff		*nfct_reasm;
 #endif