From 95a9083f0be468095683bd39f3d53d3eccd3d614 Mon Sep 17 00:00:00 2001
From: Neal Cardwell <ncardwell@google.com>
Date: Mon, 16 Apr 2012 07:08:06 +0000
Subject: [PATCH] --- yaml --- r: 300781 b: refs/heads/master c:
 f4f9f6e75d67ddfcfea79a2108217bc654aef3af h: refs/heads/master i:   300779:
 c31b0916707e4e4814396fb1425c443d4118ee7b v: v3

---
 [refs]                  | 2 +-
 trunk/include/net/tcp.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e28cf9472bff..dae0893891f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65cff8720164611ec617d4cc1ea65f2deb3832b6
+refs/heads/master: f4f9f6e75d67ddfcfea79a2108217bc654aef3af
diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h
index 025c31aa65df..d5984e353826 100644
--- a/trunk/include/net/tcp.h
+++ b/trunk/include/net/tcp.h
@@ -645,16 +645,17 @@ struct tcp_skb_cb {
 	__u32		end_seq;	/* SEQ + FIN + SYN + datalen	*/
 	__u32		when;		/* used to compute rtt's	*/
 	__u8		tcp_flags;	/* TCP header flags. (tcp[13])	*/
+
 	__u8		sacked;		/* State flags for SACK/FACK.	*/
 #define TCPCB_SACKED_ACKED	0x01	/* SKB ACK'd by a SACK block	*/
 #define TCPCB_SACKED_RETRANS	0x02	/* SKB retransmitted		*/
 #define TCPCB_LOST		0x04	/* SKB is lost			*/
 #define TCPCB_TAGBITS		0x07	/* All tag bits			*/
-	__u8		ip_dsfield;	/* IPv4 tos or IPv6 dsfield	*/
-	/* 1 byte hole */
 #define TCPCB_EVER_RETRANS	0x80	/* Ever retransmitted frame	*/
 #define TCPCB_RETRANS		(TCPCB_SACKED_RETRANS|TCPCB_EVER_RETRANS)
 
+	__u8		ip_dsfield;	/* IPv4 tos or IPv6 dsfield	*/
+	/* 1 byte hole */
 	__u32		ack_seq;	/* Sequence number ACK'd	*/
 };