From 6320c6c3623c6864a64496ef144a90c21f320b23 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 5 Jan 2012 07:13:39 +0000 Subject: [PATCH] --- yaml --- r: 279501 b: refs/heads/master c: 9f42f126154786e6e76df513004800c8c633f020 h: refs/heads/master i: 279499: 06c9c1d6ab6dbf3a265204a00b13efcfc05ba6df v: v3 --- [refs] | 2 +- trunk/include/linux/skbuff.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 55d4b698ab57..0c730e31224e 100644 --- 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 index f47f0c3939f2..50db9b04a552 100644 --- 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()