From patchwork Tue Apr 25 17:15:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 754938 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wC8xn3RWJz9s7q for ; Wed, 26 Apr 2017 03:16:13 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="lDAmdktX"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1951805AbdDYRQK (ORCPT ); Tue, 25 Apr 2017 13:16:10 -0400 Received: from mail-io0-f181.google.com ([209.85.223.181]:34760 "EHLO mail-io0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1951784AbdDYRQD (ORCPT ); Tue, 25 Apr 2017 13:16:03 -0400 Received: by mail-io0-f181.google.com with SMTP id a103so219102626ioj.1 for ; Tue, 25 Apr 2017 10:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TTAxyOKgiKZekaRm2yY7IJAOcbC4wTzm9vQDc8uPQFE=; b=lDAmdktXKZU55iSIhM/EnQpZpymWNput0MhEgdsn0n7DKuIQ0Fg0oC729Hxdp2vq28 lWN+qTeam94S77JRcbfDVR7ABdiGItl4U00aUaWBR60d1+kciMrp9ZOsyp8gJ20msabZ 6dAKFF+wl334YJQlShcFkIgvzHMY0aOiwDALvVdFuglaegToaMx+Fd3ozI2Lg7Q5Re+z vNd44n33OPsFGpippS/JGwQyzgzBEpliLIx1c2YnDL5t8q6FsTkFYKYtTwPhvmQfbrRL 5e7WH0T+mTQ4GQkgl2Mmp7Dk7afeT4nPjivvuNmlkTspLdX5GisTBfKC8e8aLWincVBn KYVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TTAxyOKgiKZekaRm2yY7IJAOcbC4wTzm9vQDc8uPQFE=; b=l8EFXc9pS+fknO9ajWo9/l9dPTLYVv5Y/BbiXZXEbhPQMHeBec0oCSzvYWcVolZEhe dI8YEVo6on6SAxgg16vtmvAVyrv7BEWCSD9WfLt8jQZ3q1P3khgX8suTSJ1k/2bs8GiZ p6W2xlnj/O8u4l1+xOmeydTm9T63l+1x2ckxdjYPDLy0VAcUmbYUp5xzMvzR3dwOjgA/ pQi8/AW+Y9U6+fUzv2vxai5Cmt6zY2fXvUEt9zbJV3zuqZVLKoQEyACOLuxJAefUAxLc Y77wOomdSnX1wKbQicgDpd2Kg+Ek8taYMbTk7AJOnvjToW654rJyX7GBDeIwrVMZ1RDX cqyg== X-Gm-Message-State: AN3rC/5lVLZ59WxozqOTRbtnYFoxYdmszrAt7dOtn9VU/g+thP5HXo1a iIIK4xApo4aRV0DT X-Received: by 10.107.129.79 with SMTP id c76mr16265490iod.92.1493140562710; Tue, 25 Apr 2017 10:16:02 -0700 (PDT) Received: from localhost ([2620:15c:2cb:201:912d:7c9d:e5a0:6e23]) by smtp.gmail.com with ESMTPSA id u133sm197366iod.21.2017.04.25.10.16.01 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 25 Apr 2017 10:16:02 -0700 (PDT) From: Eric Dumazet To: "David S . Miller" Cc: netdev , Soheil Hassas Yeganeh , Eric Dumazet , Eric Dumazet Subject: [PATCH net-next 05/10] tcp: do not pass timestamp to tcp_fastretrans_alert() Date: Tue, 25 Apr 2017 10:15:36 -0700 Message-Id: <20170425171541.3417-6-edumazet@google.com> X-Mailer: git-send-email 2.13.0.rc0.306.g87b477812d-goog In-Reply-To: <20170425171541.3417-1-edumazet@google.com> References: <20170425171541.3417-1-edumazet@google.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Not used anymore now tp->tcp_mstamp holds the information. This is needed to remove sack_state.ack_time in a following patch. Signed-off-by: Eric Dumazet Acked-by: Soheil Hassas Yeganeh Acked-by: Neal Cardwell --- net/ipv4/tcp_input.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 99b0d65de169a13679477f49f3733ca00c842090..68094aa8cfb2ee2dc6939ea1931277b745deae4a 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -2787,8 +2787,7 @@ static void tcp_rack_identify_loss(struct sock *sk, int *ack_flag) * tcp_xmit_retransmit_queue(). */ static void tcp_fastretrans_alert(struct sock *sk, const int acked, - bool is_dupack, int *ack_flag, int *rexmit, - const struct skb_mstamp *ack_time) + bool is_dupack, int *ack_flag, int *rexmit) { struct inet_connection_sock *icsk = inet_csk(sk); struct tcp_sock *tp = tcp_sk(sk); @@ -3646,8 +3645,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) if (tcp_ack_is_dubious(sk, flag)) { is_dupack = !(flag & (FLAG_SND_UNA_ADVANCED | FLAG_NOT_DUP)); - tcp_fastretrans_alert(sk, acked, is_dupack, &flag, &rexmit, - &sack_state.ack_time); + tcp_fastretrans_alert(sk, acked, is_dupack, &flag, &rexmit); } if (tp->tlp_high_seq) tcp_process_tlp_ack(sk, ack, flag); @@ -3668,8 +3666,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) no_queue: /* If data was DSACKed, see if we can undo a cwnd reduction. */ if (flag & FLAG_DSACKING_ACK) - tcp_fastretrans_alert(sk, acked, is_dupack, &flag, &rexmit, - &sack_state.ack_time); + tcp_fastretrans_alert(sk, acked, is_dupack, &flag, &rexmit); /* If this ack opens up a zero window, clear backoff. It was * being used to time the probes, and is probably far higher than * it needs to be for normal retransmission. @@ -3693,8 +3690,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) skb_mstamp_get(&sack_state.ack_time); flag |= tcp_sacktag_write_queue(sk, skb, prior_snd_una, &sack_state); - tcp_fastretrans_alert(sk, acked, is_dupack, &flag, &rexmit, - &sack_state.ack_time); + tcp_fastretrans_alert(sk, acked, is_dupack, &flag, &rexmit); tcp_xmit_recovery(sk, rexmit); }