tgupdate: merge t/upstream base into t/upstream

multipath-tcp · Nov 19, 2020 · 46e6ddc · 46e6ddc
2 parents d9d1b16 + c52d794
commit 46e6ddc
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
@@ -1262,11 +1262,12 @@ static void mptcp_push_pending(struct sock *sk, unsigned int flags)
 		mptcp_push_release(sk, ssk, &info);
 
 out:
-	/* start the timer, if it's not pending */
-	if (!mptcp_timer_pending(sk))
-		mptcp_reset_timer(sk);
-	if (copied)
+	if (copied) {
+		/* start the timer, if it's not pending */
+		if (!mptcp_timer_pending(sk))
+			mptcp_reset_timer(sk);
 		__mptcp_check_send_data_fin(sk);
+	}
 }
 
 static int mptcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)