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)
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>

Trivial merge