Merge branch 'tcp'
authorDavid S. Miller <davem@davemloft.net>
Tue, 23 Jul 2013 01:01:09 +0000 (18:01 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Jul 2013 01:01:09 +0000 (18:01 -0700)
commit20ff44aad10b82aa173c1de253dded5590a9d10b
treeecbd6be76046918abb5a61941d0f845ea2c97b27
parentc3f51d5f387b552b9d9fd7f41e19b84929712f82
parented08495c31bb991de636d2488abaa50b39f2ff4a
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>