From 77095ec82bf734d65a590a41f222678d20d9e051 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Fri, 24 Aug 2007 22:21:50 -0700
Subject: [PATCH] --- yaml --- r: 64534 b: refs/heads/master c:
 26722873a460703e319462afa7ebb8ed3a036c07 h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/net/ipv4/tcp_input.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 51aeb8c88edd..bac9daf2a43d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a96fb49be3dd2031f722bf32af6ed7db965b60f7
+refs/heads/master: 26722873a460703e319462afa7ebb8ed3a036c07
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index f030435e0eb4..9785df37a65f 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -755,7 +755,15 @@ void tcp_update_metrics(struct sock *sk)
 	}
 }
 
-/* Numbers are taken from RFC2414.  */
+/* Numbers are taken from RFC3390.
+ *
+ * John Heffner states:
+ *
+ *	The RFC specifies a window of no more than 4380 bytes
+ *	unless 2*MSS > 4380.  Reading the pseudocode in the RFC
+ *	is a bit misleading because they use a clamp at 4380 bytes
+ *	rather than use a multiplier in the relevant range.
+ */
 __u32 tcp_init_cwnd(struct tcp_sock *tp, struct dst_entry *dst)
 {
 	__u32 cwnd = (dst ? dst_metric(dst, RTAX_INITCWND) : 0);