Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, as well as one instance
(vxlan) of a bug fix in 'net' overlapping with code movement
in 'net-next'.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c
index c26241f3057b..7b7eec439906 100644
--- a/net/ipv4/tcp_metrics.c
+++ b/net/ipv4/tcp_metrics.c
@@ -551,7 +551,7 @@ reset:
          */
         if (crtt > tp->srtt_us) {
                 /* Set RTO like tcp_rtt_estimator(), but from cached RTT. */
-                crtt /= 8 * USEC_PER_MSEC;
+                crtt /= 8 * USEC_PER_SEC / HZ;
                 inet_csk(sk)->icsk_rto = crtt + max(2 * crtt, tcp_rto_min(sk));
         } else if (tp->srtt_us == 0) {
                 /* RFC6298: 5.7 We've failed to get a valid RTT sample from