From patchwork Mon Feb 25 09:42:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taehee Yoo X-Patchwork-Id: 1047639 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="buunOE7P"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 447H6y6900z9s1B for ; Mon, 25 Feb 2019 20:42:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726565AbfBYJmt (ORCPT ); Mon, 25 Feb 2019 04:42:49 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:45660 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726315AbfBYJms (ORCPT ); Mon, 25 Feb 2019 04:42:48 -0500 Received: by mail-pg1-f196.google.com with SMTP id y4so4222037pgc.12 for ; Mon, 25 Feb 2019 01:42:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=UaPt/KTwbDCKX0stdpxbW1EaA69t/maJZblQZ+UmUII=; b=buunOE7PlFvhFk1u8LTPLcNPEgDEl/AzbvF7QAkIDLblnkJElWabCb+J8Mx2pfVSjV E2nfTSPockRR1gvXErUgTkBv1hYp9/f9jA4RTqtvCKH9LJkww8b/nPv0Q25Ti5Hsv3JU OjRTBOT2Hedv8qNakem/O0xVOv+t1ajex2FD2rBiBJcqZSlyAJvpelUU2F3HhMo5LG8i 3fJf3KXCzVMFxaYFa1Eaivc7U4kTy7XQR/Te4mYuEsAZQiMR7gCk3hLUlgKgL6x+O2t8 x4I4ebC5faD+V+1qJO0ACVaNIv6K0rit8l/MTq/AXAMZ4lRA43S52nTJ4fmIOSnKrIhZ 41DQ== 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; bh=UaPt/KTwbDCKX0stdpxbW1EaA69t/maJZblQZ+UmUII=; b=JAvZe1EbopWGXnH8grNc9P/euUHJUIwdxdt9IFFMpE+eP2sYUmE2oV9gYvCurN9SyB eIbZaNG/Pf9RgkEjTp3qouvTrZFfmvQ/r7ZuzEPCDS2KvTSiyGqrfDGfQPmTw+fqPdU6 pvFgDPCrsazoSVoSOt01JVJ3nBqYKw/XnL84mV9UTgQfY5xG0UpIFsSXNfCbD15xegvQ qbqTpEbE8IDHHCBJU4b8Mch/sWWi+lGbK+EKeaYlktN3RtGQoPdTENz5e6gF60rFvVRr 8vJQvzDOlxLPEvvHFedM3UqyaZajaYgTw3u2lQeFTlACmgomyWmpZH4AzVBhkc6quL2w EmTQ== X-Gm-Message-State: AHQUAuYd4EuS//LaxpBZ48tQEboih1l8dif4/9erLbDjj2W7dr/jnseD 1VfZhQ82Eq24+hdPvBXyme0= X-Google-Smtp-Source: AHgI3IZ0Y1cC4nzSfK5ydgDRHkbNTJQB/MTAvB4IoJaQcbUXYHiZZONmtoIDsYOuz9F7iG3qynFiGQ== X-Received: by 2002:a62:3890:: with SMTP id f138mr9418492pfa.148.1551087767715; Mon, 25 Feb 2019 01:42:47 -0800 (PST) Received: from ap-To-be-filled-by-O-E-M.8.8.8.8 ([14.33.120.60]) by smtp.gmail.com with ESMTPSA id c7sm14300391pfa.24.2019.02.25.01.42.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Feb 2019 01:42:46 -0800 (PST) From: Taehee Yoo To: davem@davemloft.net, edumazet@google.com, netdev@vger.kernel.org Cc: Taehee Yoo Subject: [PATCH net-next] tcp: remove unused parameter of tcp_sacktag_bsearch() Date: Mon, 25 Feb 2019 18:42:33 +0900 Message-Id: <20190225094233.16231-1-ap420073@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org parameter state in the tcp_sacktag_bsearch() is not used. So, it can be removed. Signed-off-by: Taehee Yoo Signed-off-by: Eric Dumazet --- net/ipv4/tcp_input.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 7a027dec649b..6ac274249961 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1574,9 +1574,7 @@ static struct sk_buff *tcp_sacktag_walk(struct sk_buff *skb, struct sock *sk, return skb; } -static struct sk_buff *tcp_sacktag_bsearch(struct sock *sk, - struct tcp_sacktag_state *state, - u32 seq) +static struct sk_buff *tcp_sacktag_bsearch(struct sock *sk, u32 seq) { struct rb_node *parent, **p = &sk->tcp_rtx_queue.rb_node; struct sk_buff *skb; @@ -1598,13 +1596,12 @@ static struct sk_buff *tcp_sacktag_bsearch(struct sock *sk, } static struct sk_buff *tcp_sacktag_skip(struct sk_buff *skb, struct sock *sk, - struct tcp_sacktag_state *state, u32 skip_to_seq) { if (skb && after(TCP_SKB_CB(skb)->seq, skip_to_seq)) return skb; - return tcp_sacktag_bsearch(sk, state, skip_to_seq); + return tcp_sacktag_bsearch(sk, skip_to_seq); } static struct sk_buff *tcp_maybe_skipping_dsack(struct sk_buff *skb, @@ -1617,7 +1614,7 @@ static struct sk_buff *tcp_maybe_skipping_dsack(struct sk_buff *skb, return skb; if (before(next_dup->start_seq, skip_to_seq)) { - skb = tcp_sacktag_skip(skb, sk, state, next_dup->start_seq); + skb = tcp_sacktag_skip(skb, sk, next_dup->start_seq); skb = tcp_sacktag_walk(skb, sk, NULL, state, next_dup->start_seq, next_dup->end_seq, 1); @@ -1758,8 +1755,7 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb, /* Head todo? */ if (before(start_seq, cache->start_seq)) { - skb = tcp_sacktag_skip(skb, sk, state, - start_seq); + skb = tcp_sacktag_skip(skb, sk, start_seq); skb = tcp_sacktag_walk(skb, sk, next_dup, state, start_seq, @@ -1785,7 +1781,7 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb, goto walk; } - skb = tcp_sacktag_skip(skb, sk, state, cache->end_seq); + skb = tcp_sacktag_skip(skb, sk, cache->end_seq); /* Check overlap against next cached too (past this one already) */ cache++; continue; @@ -1796,7 +1792,7 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb, if (!skb) break; } - skb = tcp_sacktag_skip(skb, sk, state, start_seq); + skb = tcp_sacktag_skip(skb, sk, start_seq); walk: skb = tcp_sacktag_walk(skb, sk, next_dup, state,