Merge branch 'tcp-fixes-in-timeout-and-retransmission-accounting'

Yuchung Cheng says:

====================
tcp: fixes in timeout and retransmission accounting

This patch set has assorted fixes of minor accounting issues in
timeout, window probe, and retransmission stats.
====================

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