---

yaml --- r: 4111 b: refs/heads/master c: 1cbb338 h: refs/heads/master i: 4109: aef0305 4107: ca5f6dd 4103: a661607 4095: 39ad1ee v: v3
git-mirror · Jul 5, 2005 · cdc8409 · cdc8409
1 parent 7783542
commit cdc8409
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e176fe8954a5239c24afe79b1001ba3c29511963
+refs/heads/master: 1cbb3380ef683f742876f48e3739b3df4ea9e168
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
@@ -248,17 +248,18 @@ struct sk_buff {
 				data_len,
 				mac_len,
 				csum;
-	unsigned char		local_df,
-				cloned:1,
-				nohdr:1,
-				pkt_type,
-				ip_summed;
 	__u32			priority;
-	unsigned short		protocol;
+	__u8			local_df:1,
+				cloned:1,
+				ip_summed:2,
+				nohdr:1;
+				/* 3 bits spare */
+	__u8			pkt_type;
+	__u16			protocol;
 
 	void			(*destructor)(struct sk_buff *skb);
 #ifdef CONFIG_NETFILTER
-        unsigned long		nfmark;
+	unsigned long		nfmark;
 	__u32			nfcache;
 	__u32			nfctinfo;
 	struct nf_conntrack	*nfct;