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

The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.

The TCP conflict was a case of local variables in a function
being removed from both net and net-next.

In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.

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

1 files changed, 9 insertions, 18 deletions

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index d49bff51bdb7..3e0d19631534 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2375,23 +2375,14 @@ bool tcp_schedule_loss_probe(struct sock *sk)
 {
         struct inet_connection_sock *icsk = inet_csk(sk);
         struct tcp_sock *tp = tcp_sk(sk);
-        u32 timeout, tlp_time_stamp, rto_time_stamp;
+        u32 timeout, rto_delta_us;
 
-        /* No consecutive loss probes. */
-        if (WARN_ON(icsk->icsk_pending == ICSK_TIME_LOSS_PROBE)) {
-                tcp_rearm_rto(sk);
-                return false;
-        }
         /* Don't do any loss probe on a Fast Open connection before 3WHS
          * finishes.
          */
         if (tp->fastopen_rsk)
                 return false;
 
-        /* TLP is only scheduled when next timer event is RTO. */
-        if (icsk->icsk_pending != ICSK_TIME_RETRANS)
-                return false;
-
         /* Schedule a loss probe in 2*RTT for SACK capable connections
          * in Open state, that are either limited by cwnd or application.
          */
@@ -2418,14 +2409,10 @@ bool tcp_schedule_loss_probe(struct sock *sk)
                 timeout = TCP_TIMEOUT_INIT;
         }
 
-        /* If RTO is shorter, just schedule TLP in its place. */
-        tlp_time_stamp = tcp_jiffies32 + timeout;
-        rto_time_stamp = (u32)inet_csk(sk)->icsk_timeout;
-        if ((s32)(tlp_time_stamp - rto_time_stamp) > 0) {
-                s32 delta = rto_time_stamp - tcp_jiffies32;
-                if (delta > 0)
-                        timeout = delta;
-        }
+        /* If the RTO formula yields an earlier time, then use that time. */
+        rto_delta_us = tcp_rto_delta_us(sk);  /* How far in future is RTO? */
+        if (rto_delta_us > 0)
+                timeout = min_t(u32, timeout, usecs_to_jiffies(rto_delta_us));
 
         inet_csk_reset_xmit_timer(sk, ICSK_TIME_LOSS_PROBE, timeout,
                                   TCP_RTO_MAX);
@@ -3450,6 +3437,10 @@ int tcp_connect(struct sock *sk)
         int err;
 
         tcp_call_bpf(sk, BPF_SOCK_OPS_TCP_CONNECT_CB);
+
+        if (inet_csk(sk)->icsk_af_ops->rebuild_header(sk))
+                return -EHOSTUNREACH; /* Routing failure or similar. */
+
         tcp_connect_init(sk);
 
         if (unlikely(tp->repair)) {