From ee2aa77c590a683dc41bac061e4d2765ff3511fd Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 15 Jul 2010 21:41:00 -0700
Subject: [PATCH] --- yaml --- r: 203611 b: refs/heads/master c:
 f86586fa48a94c7a9c7f36650a2e0e4a947881c9 h: refs/heads/master i:   203609:
 67bc103a8fc40ad83ae473b1391b05767cab9920   203607:
 fbdbaaa908ed7e0508c062afd6e92f69099d8d79 v: v3

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

diff --git a/[refs] b/[refs]
index 74a9b415f216..cccfa8c6d101 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ce28c6f55fe636c322ea909794cf19b20ef4b6b
+refs/heads/master: f86586fa48a94c7a9c7f36650a2e0e4a947881c9
diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h
index 468b01f01c13..df6a2eb20193 100644
--- a/trunk/include/net/tcp.h
+++ b/trunk/include/net/tcp.h
@@ -570,11 +570,10 @@ extern u32 __tcp_select_window(struct sock *sk);
 #define TCPHDR_CWR 0x80
 
 /* This is what the send packet queuing engine uses to pass
- * TCP per-packet control information to the transmission
- * code.  We also store the host-order sequence numbers in
- * here too.  This is 36 bytes on 32-bit architectures,
- * 40 bytes on 64-bit machines, if this grows please adjust
- * skbuff.h:skbuff->cb[xxx] size appropriately.
+ * TCP per-packet control information to the transmission code.
+ * We also store the host-order sequence numbers in here too.
+ * This is 44 bytes if IPV6 is enabled.
+ * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
  */
 struct tcp_skb_cb {
 	union {