Merge branch 'tcp-more-reliable-window-probes'
authorDavid S. Miller <davem@davemloft.net>
Sat, 9 May 2015 20:42:32 +0000 (16:42 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 9 May 2015 20:42:32 +0000 (16:42 -0400)
Eric Dumazet says:

====================
tcp: more reliable window probes

This series address a problem caused by small rto_min timers in DC,
leading to either timer storms or early flow terminations.

We also add two new SNMP counters for proper monitoring :
TCPWinProbe and TCPKeepAlive

v2: added TCPKeepAlive counter, as suggested by Yuchung & Neal
====================

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

Trivial merge