---

yaml --- r: 290083 b: refs/heads/master c: 4031ae6 h: refs/heads/master i: 290081: 5040942 290079: 5d7b575 v: v3
git-mirror · Feb 10, 2012 · 57f380d · 57f380d
1 parent e65ef08
commit 57f380d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -438,15 +438,18 @@ 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
 	__u16			tc_verd;	/* traffic control verdict */
 #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;