---

yaml --- r: 279501 b: refs/heads/master c: 9f42f12 h: refs/heads/master i: 279499: 06c9c1d v: v3
git-mirror · Jan 5, 2012 · 6320c6c · 6320c6c
1 parent 5665845
commit 6320c6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eeca6688d6599c28bc449a45facb67d7f203be74
+refs/heads/master: 9f42f126154786e6e76df513004800c8c633f020
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
@@ -242,15 +242,15 @@ struct ubuf_info {
  * the end of the header data, ie. at skb->end.
  */
 struct skb_shared_info {
-	unsigned short	nr_frags;
+	unsigned char	nr_frags;
+	__u8		tx_flags;
 	unsigned short	gso_size;
 	/* Warning: this field is not always filled in (UFO)! */
 	unsigned short	gso_segs;
 	unsigned short  gso_type;
-	__be32          ip6_frag_id;
-	__u8		tx_flags;
 	struct sk_buff	*frag_list;
 	struct skb_shared_hwtstamps hwtstamps;
+	__be32          ip6_frag_id;
 
 	/*
 	 * Warning : all fields before dataref are cleared in __alloc_skb()