From cdc84095fd5cdbadd348a00706fd28fb28cd2dda Mon Sep 17 00:00:00 2001
From: Thomas Graf <tgraf@suug.ch>
Date: Tue, 5 Jul 2005 14:13:41 -0700
Subject: [PATCH] --- yaml --- r: 4111 b: refs/heads/master c:
 1cbb3380ef683f742876f48e3739b3df4ea9e168 h: refs/heads/master i:   4109:
 aef030532b559e937f161937025c18e58be85b68   4107:
 ca5f6dd22eb36d1510be698059ef4b66737827a1   4103:
 a6616076620d7772ffa8b591edaeb4e37f754a53   4095:
 39ad1eed1795cfe398d90d135adf04b6fc26ea86 v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/skbuff.h | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 4456a46d73df..5b71ccf3a933 100644
--- 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
index 1e6290f4f81e..14b950413495 100644
--- 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;