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

Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

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

1 files changed, 4 insertions, 1 deletions

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 5ee6fe0d152d..e6e65f79ade8 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2907,7 +2907,10 @@ static void tcp_update_rtt_min(struct sock *sk, u32 rtt_us)
 {
         const u32 now = tcp_time_stamp, wlen = sysctl_tcp_min_rtt_wlen * HZ;
         struct rtt_meas *m = tcp_sk(sk)->rtt_min;
-        struct rtt_meas rttm = { .rtt = (rtt_us ? : 1), .ts = now };
+        struct rtt_meas rttm = {
+                .rtt = likely(rtt_us) ? rtt_us : jiffies_to_usecs(1),
+                .ts = now,
+        };
         u32 elapsed;
 
         /* Check if the new measurement updates the 1st, 2nd, or 3rd choices */