From: David S. Miller <davem@davemloft.net>
Date: Tue, 23 Jul 2013 01:01:09 +0000 (-0700)
Subject: Merge branch 'tcp'
X-Git-Tag: v3.12-rc1~132^2~485
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=20ff44aad10b82aa173c1de253dded5590a9d10b;p=kernel%2Fkernel-generic.git

Merge branch 'tcp'

Yuchung Cheng says:

====================
This patch series improve RTT sampling in three ways:
1. Sample RTT during fast recovery and reordering events.
2. Favor ack-based RTT to timestamps because of broken TS ECR fields
3. Consolidate the RTT measurement logic.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

20ff44aad10b82aa173c1de253dded5590a9d10b