Message ID | 20100830052734.GB5332@gerrit.erg.abdn.ac.uk |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Gerrit Renker <gerrit@erg.abdn.ac.uk> Date: Mon, 30 Aug 2010 07:27:34 +0200 > This is an update to the earlier DCCP 5-patch set, sent separately in case this > question is a contentious issue. > > However, it does look as if the newer RFC 5681 is indeed the normative case for > the RFC 3390 initial window value. > > If there are no objections, I would like to submit this as an update for net-2.6. I don't have any objectioned but I'm going to put it into net-next-2.6 as I don't see any real reason to rush something like this. Thanks! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -791,17 +791,11 @@ static inline __u32 tcp_current_ssthresh /* * Convert RFC 3390 larger initial window into an equivalent number of packets. - * - * 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 a multiplier in the relevant range. + * This is based on the numbers specified in RFC 5681, 3.1. */ static inline u32 rfc3390_bytes_to_packets(const u32 smss) { - return smss <= 1095 ? 4 : (smss > 1460 ? 2 : 3); + return smss <= 1095 ? 4 : (smss > 2190 ? 2 : 3); } extern void tcp_enter_cwr(struct sock *sk, const int set_ssthresh);