From nobody Thu Sep 18 12:38:12 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:a689:0:0:0:0:0 with SMTP id j9csp2214611jam; Tue, 21 Sep 2021 04:39:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMj/EJw3fg2SsQ8Rt/BONHtBm/fiDzxH5rd2a84xDrLQ+EAEDyd2y8SuMoh4vywbPbbdd6 X-Received: by 2002:a63:7e41:: with SMTP id o1mr14449619pgn.436.1632224388356; Tue, 21 Sep 2021 04:39:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632224388; cv=none; d=google.com; s=arc-20160816; b=KDEJfZnUEUW8uE2zQt0ITLUidBtEdRBcWw8epSzY0xyKhxt4lGTIMyqmwVcjHQvZms Js8CZUon0L9XxiJIXZX6ogBzvwhnlXAVKWSqrM9fsPzUVUkWy9H5CdS1zVa5fOiDM5Jk EzTzSw07GSCWpEQMKj8niRSqjiiYlIpfxw6joi4uoFZ5p5QPS1t2l39qhRzi6hHLErIt rB79WOD+YpndX2UdiBnmqgDDgv0bbZzDOzPWrka9gDbJe8xN0FlQFNhkUz9fuoECpvIe 4iVMfMTITMhAU/6nLbtHaIuahBepo3nxA7rnMrTrdwxxaYrhRmCy8Swg9kT5M++If2Pl 8KgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=cVopC3MwRdoidOVDTHAv0XPH/07fSiWFiO19TOP4P5A=; b=xd/EajBYR5wpeoL/xIx+Zul9eArqPZ5qQCcBu0hmGjVQ6pSt4DMhROZqxn+nF1hzhm lhC/7ZndXl2dRt5RDPNMQKUPV4OTebF8lC3fLV/H7A9qnnmad71pd/40FAz1fEkd43k8 +yIrGWncVVDfv/JW0L5gawPtRuv5d/X8X6HVggn6dMK1vjP2srb8UYBZ8JuSgvEdYp1j ISjam+IMfcE3afWZlGVol9/9l8pES/W4hGkMKUXGB/sBn0tJt5CiO1c4lOvI+wEgOVFd FS0W7c+yleu1dvhrk6Wc+OicQnJNAesJIPVUfN5ZZDysYdujPwJl6RCz5Fm+7Utn/wbK NFJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NFYMMakB; spf=pass (google.com: domain of mptcp+bounces-1996-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-1996-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id d15si20578000pfj.27.2021.09.21.04.39.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Sep 2021 04:39:48 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-1996-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NFYMMakB; spf=pass (google.com: domain of mptcp+bounces-1996-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-1996-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id B4AC73E0EFD for ; Tue, 21 Sep 2021 11:39:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A0B143FCE; Tue, 21 Sep 2021 11:39:44 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 814653FCD for ; Tue, 21 Sep 2021 11:39:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632224382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cVopC3MwRdoidOVDTHAv0XPH/07fSiWFiO19TOP4P5A=; b=NFYMMakBQuPZgfHYEqlcENL7ThmbsQKZucq9nNVP5REN0IN5kpxfb9RYwchyFQZyzhp64q 52tjX9NfCQS8f/czVWnbqez1QHA+WB2hHnJpqqbUu1KAeIsEVFtOoU69i0TMNVOtDUKcEj uVDJC6jr4d2X6tw+MZMaZWTquPVRSlY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-333-zObhymfcM8yiJCOFOZfEsg-1; Tue, 21 Sep 2021 07:39:41 -0400 X-MC-Unique: zObhymfcM8yiJCOFOZfEsg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 99B89BBEE3 for ; Tue, 21 Sep 2021 11:39:40 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.195.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1138E60C17 for ; Tue, 21 Sep 2021 11:39:39 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v2 3/3] tcp: make tcp_build_frag() static Date: Tue, 21 Sep 2021 13:39:27 +0200 Message-Id: <4be7c77b82fd1de877ee60377aeb6afe249797d8.1632217366.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" After the previous patch the mentioned helper is used only inside its compilation unit: let's make it static. RFC -> v1: - preserve the tcp_build_frag() helper (Eric) Signed-off-by: Paolo Abeni --- Note: this should _replace_: """ Partially revert "tcp: factor out tcp_build_frag()" """ I did not opted for a squash to patch, as it would still require conflicts resolution after the previous squash-to patch. @matttbe: please let me know if you prefer otherwise. --- include/net/tcp.h | 2 -- net/ipv4/tcp.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 4a96f6e0f6f8..673c3b01e287 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -330,8 +330,6 @@ int tcp_sendpage(struct sock *sk, struct page *page, in= t offset, size_t size, int flags); int tcp_sendpage_locked(struct sock *sk, struct page *page, int offset, size_t size, int flags); -struct sk_buff *tcp_build_frag(struct sock *sk, int size_goal, int flags, - struct page *page, int offset, size_t *size); ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset, size_t size, int flags); int tcp_send_mss(struct sock *sk, int *size_goal, int flags); diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index c592454625e1..29cb7bf9dc1c 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -963,8 +963,8 @@ void tcp_remove_empty_skb(struct sock *sk, struct sk_bu= ff *skb) } } =20 -struct sk_buff *tcp_build_frag(struct sock *sk, int size_goal, int flags, - struct page *page, int offset, size_t *size) +static struct sk_buff *tcp_build_frag(struct sock *sk, int size_goal, int = flags, + struct page *page, int offset, size_t *size) { struct sk_buff *skb =3D tcp_write_queue_tail(sk); struct tcp_sock *tp =3D tcp_sk(sk); --=20 2.26.3