Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp17618722ybl; Thu, 2 Jan 2020 08:46:59 -0800 (PST) X-Google-Smtp-Source: APXvYqw2E+Rb6PXuZ8czj1F4nd2UYG9UCCqNBjL9M73wtWUV7I8bX8VF256qngwuNsaHAQK+QRYc X-Received: by 2002:a9d:4d86:: with SMTP id u6mr69123031otk.42.1577983619880; Thu, 02 Jan 2020 08:46:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577983619; cv=none; d=google.com; s=arc-20160816; b=tkp3bDQEfZyko3tE19hgc8bL2yh4iQpa9Rt727NQUYIVe9dJhy34oriSIBYXcStK7+ yenUy4RcrmDi367wv8RkcE0t9lZpsI7hkT2H8mhT7V/FStgVac2GhqaHX1PyVkbttE8g PcZHIGZTj4ZUHQQZ6xEqspsNADtc450iHNE8oFQ8jxxLDnW01giWRA2JbW8KGPN17C/Y 8HfB4ohGpatBsQ5KYOIuIQZj59BNpg15419J6VJBn4RobUwgh/m8EyjrWxEOYSb8DFK3 DTTRSZxhW9Ke+Si/+On9UI3nJO4vy3MSWmdZfSAbkp1Ba6NWIHMx0Hj13TBPayybJye8 NzoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=HrXZHjoaqPfSnNyTU19HMM3kSDFb9R+CP52wZpLZIuo=; b=mt1tWCXfhhDKNDvMfnRxboONVooZqexNctp8DF76WanLw6hxoN+6reYFnDQcZiTDX3 ScmzgD1pLBk13W8z4622VmBXrkkmCRBRepppSZozJ3p674pqKUvNfnkppXplXc0NcuZr hDrUM0jd41sBwwJ8t1Eadne+83cHTz+kLbKeYkAR41Q1pAJUhsnjDgrydlMzT/h6xUch j/uNbJziqmHOFSJtezTAgEh+UmhzKZ6RhaevoGXRgjtORWmVzgEGY55vWQS0f/aVDAqU KUbpXyPPXA4StxNeP5y1uL5GXIzjKtMZ4qB0icnZSi0vPwfbDsHwO36gtBPqhwmKrZJb eDTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=oZDMXInU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s6si28189394otp.126.2020.01.02.08.46.46; Thu, 02 Jan 2020 08:46:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=oZDMXInU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728865AbgABQqG (ORCPT + 99 others); Thu, 2 Jan 2020 11:46:06 -0500 Received: from mail-ot1-f67.google.com ([209.85.210.67]:46128 "EHLO mail-ot1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728280AbgABQqF (ORCPT ); Thu, 2 Jan 2020 11:46:05 -0500 Received: by mail-ot1-f67.google.com with SMTP id k8so40561075otl.13 for ; Thu, 02 Jan 2020 08:46:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=HrXZHjoaqPfSnNyTU19HMM3kSDFb9R+CP52wZpLZIuo=; b=oZDMXInUNArVNUW5UNFWUMC7Jp695Zoz74GDjl3LBV/bbxKG4HUUE40V3jrzG3y8Ui zui1rKKQiyH1UjgmgJUeBORIa0he8Ne2fxb7MCqdhLjMnvQlSs6rMeDncPncb9oMWR++ SlRcj6X6nm8RU3QrlEQO0zwdSBSVKAir5650sALyjB4rksyfnGJeBaHAQHLznsN/hNgr DV7Zq2a6w9mu2w0P92jtFgWwCD2gH23ZyQ8B2EpNp7Dwr2xY1jVoBZ7aOL501MrVfpJs bpaMb8W8TuVqIKLf2aQOYr8rqtn3e4y74kMvmvpN2RoYk8mJsqhHCz6kcAnQKCMS/Au6 2/Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=HrXZHjoaqPfSnNyTU19HMM3kSDFb9R+CP52wZpLZIuo=; b=GxN9cdzOjD87UrYSZligXOZJpyafh4mBTBhQrgdpJEQbwd31hDjBUzaOAYD1YLfQ7I yotUSj/msh43D0tcpBQ4GmkJaUziLdrbbmjnoXc94zKZPfzNhvSYICPLtZhdvOOKZsLT gE3LyXKf7Ll9IT4bAJBN9IN+fJzPaWlwKyes10xRY83NTXFeBp///uXXlE0u1K6fihLQ zBrU23VthTXt5c+qiyxWYCGPzS1zt9fxeopqBaDznIP56Ac/+G/e4Y4LkO74atS7EfsD SAeKP0oAEXuzOGbOl+CeiLWuMwxH5dtH/NKhRnUpcpItb7Bh6tInwUB39Kt2mKJykpN3 gZXw== X-Gm-Message-State: APjAAAVwcDXJGJMIJVpIvpv3UojvXebIwEh083qk+IjLZD8O3RyIK/Nh LuLg4wVVDqr+fHLG5i6I6VLP0g1jqaMK5IFpaouuUg== X-Received: by 2002:a05:6830:13da:: with SMTP id e26mr19927139otq.302.1577983564414; Thu, 02 Jan 2020 08:46:04 -0800 (PST) MIME-Version: 1.0 References: <20200102140227.77780-1-maowenan@huawei.com> In-Reply-To: <20200102140227.77780-1-maowenan@huawei.com> From: Neal Cardwell Date: Thu, 2 Jan 2020 11:45:47 -0500 Message-ID: Subject: Re: [PATCH net-next] tcp: use REXMIT_NEW instead of magic number To: Mao Wenan Cc: Eric Dumazet , David Miller , Alexey Kuznetsov , Hideaki YOSHIFUJI , Netdev , LKML , kernel-janitors@vger.kernel.org, Yuchung Cheng Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jan 2, 2020 at 9:07 AM Mao Wenan wrote: > > REXMIT_NEW is a macro for "FRTO-style > transmit of unsent/new packets", this patch > makes it more readable. > > Signed-off-by: Mao Wenan > --- > net/ipv4/tcp_input.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c > index 88b987ca9ebb..1d1e3493965f 100644 > --- a/net/ipv4/tcp_input.c > +++ b/net/ipv4/tcp_input.c > @@ -3550,7 +3550,7 @@ static void tcp_xmit_recovery(struct sock *sk, int rexmit) > if (rexmit == REXMIT_NONE || sk->sk_state == TCP_SYN_SENT) > return; > > - if (unlikely(rexmit == 2)) { > + if (unlikely(rexmit == REXMIT_NEW)) { > __tcp_push_pending_frames(sk, tcp_current_mss(sk), > TCP_NAGLE_OFF); > if (after(tp->snd_nxt, tp->high_seq)) > -- Acked-by: Neal Cardwell Thanks for sending this patch! neal