From patchwork Tue Apr 25 17:15:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 754942 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 3wC8yC5SbGz9s7q for ; Wed, 26 Apr 2017 03:16:35 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="sbHhrP37"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1951846AbdDYRQd (ORCPT ); Tue, 25 Apr 2017 13:16:33 -0400 Received: from mail-io0-f180.google.com ([209.85.223.180]:33813 "EHLO mail-io0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1951810AbdDYRQN (ORCPT ); Tue, 25 Apr 2017 13:16:13 -0400 Received: by mail-io0-f180.google.com with SMTP id a103so219106098ioj.1 for ; Tue, 25 Apr 2017 10:16:13 -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=+WRTReagnL/B4pNdBpw6yiXIb7QDnxZrRIav387qwlk=; b=sbHhrP37FUxZTeQg1ah8Tu+tbnyL/p2L/9ti3oSb7XWrydKSOoDomZxhl89P9+0lEi r2KNBPHb4FJfk1n4sfL38zGOxXRnYanqbHfG905KO4sNC9DbYZljzsYc3lV79LmQM6Xp NOgISWMbPklMM5yYtSjWTcu+5LNuXGK7SuFuTROrbSPjv7WQSgGbqDJsmAOi5FkK440f 7L/8b2JFWco4/haXFi8nNGO6VM4FnFZQAoFhKAleVVdScXZagcfrFn7QbK0CwFExfDL5 bPmiBv5k1O8ArNmcHz+L9qRTz/DgtgIbtt5r8Cy7bMC7jUzic0WdoZ52YDaDDplmdbz/ xXmw== 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=+WRTReagnL/B4pNdBpw6yiXIb7QDnxZrRIav387qwlk=; b=Sm4VI2GSVeCodsRWpuE1Fvdr4/mqmQE6Jt6v7XmbxU0zIT/xGLNOQDavhs0Ar5BgCG PRbnQbMdn5ZJ9Sh18aY8UE5XTVuswrsl9UzgKKxupcfLMKw0TV61TjJwLi/6LnglPU0H 16o60bOoPYt13Py7jrgbbuHtDqhuPXREfUH7zgmGFrkV/vinVZjCdaT8NgcoLQUkr1Ng xnpxESjMQygqASmkCBHCbbIGgOlQ8lel9I/tycqhJ/WIE59ufgAscGF9Skkp1nHDFqHE RAdwe77Bk9UUAk9ohkCMoXaFJYkqh/DByBwIwniXe7bRtPSNO/kXlyKu9i25xtz20TBA z0fQ== X-Gm-Message-State: AN3rC/5K+qp9Ouzcdr+bn96/7eV9WVc49z2YWSXKI2hluS1LFhlzGi86 POaHl8Vk2xdMQ9oe X-Received: by 10.107.9.222 with SMTP id 91mr17434825ioj.173.1493140572392; Tue, 25 Apr 2017 10:16:12 -0700 (PDT) Received: from localhost ([2620:15c:2cb:201:912d:7c9d:e5a0:6e23]) by smtp.gmail.com with ESMTPSA id w192sm2177547ith.5.2017.04.25.10.16.11 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 25 Apr 2017 10:16:11 -0700 (PDT) From: Eric Dumazet To: "David S . Miller" Cc: netdev , Soheil Hassas Yeganeh , Eric Dumazet , Eric Dumazet Subject: [PATCH net-next 09/10] tcp: remove ack_time from struct tcp_sacktag_state Date: Tue, 25 Apr 2017 10:15:40 -0700 Message-Id: <20170425171541.3417-10-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 It is no longer needed, everything uses tp->tcp_mstamp instead. Signed-off-by: Eric Dumazet Acked-by: Soheil Hassas Yeganeh Acked-by: Neal Cardwell --- net/ipv4/tcp_input.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index f4e1836c696c9a45a545a32de8ba62ce3bd0dc12..f475f0b53bfe4cb67c19b7f30d9d68bd703ff23b 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1131,7 +1131,6 @@ struct tcp_sacktag_state { */ struct skb_mstamp first_sackt; struct skb_mstamp last_sackt; - struct skb_mstamp ack_time; /* Timestamp when the S/ACK was received */ struct rate_sample *rate; int flag; }; @@ -3572,8 +3571,6 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) if (after(ack, tp->snd_nxt)) goto invalid_ack; - skb_mstamp_get(&sack_state.ack_time); - if (icsk->icsk_pending == ICSK_TIME_LOSS_PROBE) tcp_rearm_rto(sk); @@ -3684,7 +3681,6 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) * If data was DSACKed, see if we can undo a cwnd reduction. */ if (TCP_SKB_CB(skb)->sacked) { - 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);