Merge branch 'tcp'

Browse source

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>

...

This commit is contained in:

David S. Miller 2013-07-22 18:01:09 -07:00

parent c3f51d5f38 ed08495c31

commit 20ff44aad1

5 changed files with 57 additions and 80 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

include/net/tcp.h

View file

123

net/ipv4/tcp_input.c

View file

2

net/ipv4/tcp_ipv4.c

View file

8

net/ipv4/tcp_minisocks.c

View file

2

net/ipv6/tcp_ipv6.c

View file