---

yaml --- r: 22131 b: refs/heads/master c: 77d2ca3 h: refs/heads/master i: 22129: ece50c9 22127: 9e84f22 v: v3
git-mirror · Mar 21, 2006 · 32335d8 · 32335d8
1 parent 8de9a73
commit 32335d8
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: ddd7bf9fe4e59afc0a041378f82b6e1aa88f714b
+refs/heads/master: 77d2ca350018c507815f5d38a40ffb597eb9ae25
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
@@ -270,14 +270,14 @@ struct sk_buff {
 
 	void			(*destructor)(struct sk_buff *skb);
 #ifdef CONFIG_NETFILTER
-	__u32			nfmark;
 	struct nf_conntrack	*nfct;
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
 	struct sk_buff		*nfct_reasm;
 #endif
 #ifdef CONFIG_BRIDGE_NETFILTER
 	struct nf_bridge_info	*nf_bridge;
 #endif
+	__u32			nfmark;
 #endif /* CONFIG_NETFILTER */
 #ifdef CONFIG_NET_SCHED
 	__u16			tc_index;	/* traffic control index */