From 57f380d786e6fa2d02767a65cdb324260c3c7daf Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Fri, 27 Jan 2012 06:22:53 +0000
Subject: [PATCH] --- yaml --- r: 290083 b: refs/heads/master c:
 4031ae6edb92f7e0aade76357813211ae0520a5c h: refs/heads/master i:   290081:
 5040942428a59d910b2684f85958f5d340db2304   290079:
 5d7b5753429b93cd60e640d979bd4159bd7c4832 v: v3

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

diff --git a/[refs] b/[refs]
index 65aca4854dfa..0ba31671943c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a0da21be84019d605af2c9a92b20a084db77de1
+refs/heads/master: 4031ae6edb92f7e0aade76357813211ae0520a5c
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index 50db9b04a552..2b7317ff297f 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -438,6 +438,11 @@ struct sk_buff {
 #endif
 
 	int			skb_iif;
+
+	__u32			rxhash;
+
+	__u16			vlan_tci;
+
 #ifdef CONFIG_NET_SCHED
 	__u16			tc_index;	/* traffic control index */
 #ifdef CONFIG_NET_CLS_ACT
@@ -445,8 +450,6 @@ struct sk_buff {
 #endif
 #endif
 
-	__u32			rxhash;
-
 	__u16			queue_mapping;
 	kmemcheck_bitfield_begin(flags2);
 #ifdef CONFIG_IPV6_NDISC_NODETYPE
@@ -470,8 +473,6 @@ struct sk_buff {
 		__u32		dropcount;
 	};
 
-	__u16			vlan_tci;
-
 	sk_buff_data_t		transport_header;
 	sk_buff_data_t		network_header;
 	sk_buff_data_t		mac_header;