From nobody Sun Feb 8 12:37:42 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp534338jap; Fri, 7 Jan 2022 11:26:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+AZVvy2Qs/95TGAXH1VuyPsSWRLQDb2fTXefJg2kSkM51JIWDZ8IduMHIDfMtjqpCxZSe X-Received: by 2002:a37:689:: with SMTP id 131mr46878603qkg.743.1641583560999; Fri, 07 Jan 2022 11:26:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641583560; cv=none; d=google.com; s=arc-20160816; b=bpTj1DsyKsIlsvM6KP4Ms9BPDuAvz34xbQzRhH5ITqBHvEhv7ENCNUMzWOlyQfx5+Q F47dJ4GGAPAnXVH+nkEV2gOJUzKjP+983aBIL3P51gmqvZGtsW9E4dakU23Y5KlVo1M+ BnFMzLEcKXkCfVSkjl3cd8HObNwWLs9ENW9eWAZ8j7CLM0F51rkwsg3xdAgP8DHv7guz kGfGeU8njqMJyQu0XQLPTw8+AG0W0zbobBfAVQ1vpluUWqoCiRS/j2mWY7m5DS4Y5a1j QWaadZzIZUqtY/SihgrGg+pYVU+BYCt6KwvR1rSdW9UCCcc3EiWEd2fSZfJASoi4z2Y9 SDMw== 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:cc:to:from:dkim-signature; bh=Xd7z4eMwgtzz0y+eWVzOqwQEm7XdrjSnM353+4BYHm0=; b=NmAtjqyoBI15f1SLP0R8PQvpzjobBuuiWY725aR4oI9pbBBpYATd0Gi0wOf8YvFH1S rCnbA9mo6eWp1GJENzh0rAE1/8DtDuY45KMggbVPTP4bcLQrvfWnFManhIu+SfmtxfP1 QS8wD5IsCA2ETwkrRL+Z5nzc0iQJPgT18k2ykd7do4KjDWor8AOHoSeIbp2+qfyoUAXN tmBR65DxzHQoHJXTq1ao0J1DVB1ezqchahKscw2qCwsKyREIQIE4Gyoq0GKp8OFQ+8G9 dM9/Rfd5Dey/2upExplSiLv8nTTIHQOKvJBW62nzjjuyfjPrIiyxnKB8yA7Qu6QeRR7y BnrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ITOSHdLe; spf=pass (google.com: domain of mptcp+bounces-2986-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2986-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id v9si2326566qtx.254.2022.01.07.11.26.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jan 2022 11:26:00 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2986-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ITOSHdLe; spf=pass (google.com: domain of mptcp+bounces-2986-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2986-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.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 ewr.edge.kernel.org (Postfix) with ESMTPS id A846E1C0A44 for ; Fri, 7 Jan 2022 19:26:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 38CE12CA1; Fri, 7 Jan 2022 19:25:58 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 25BFB2CA3 for ; Fri, 7 Jan 2022 19:25:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641583557; x=1673119557; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qeEpQkK0Sdp8utChRD6Bzjz2YY8JES0iyVlAhZDub5s=; b=ITOSHdLegNbOu35RDm7Fy+DKpioEsIBb0Pgwb/70Q8f3eOTnvoN1fE52 Wg4AX8MBjLgD6dykuhZMqead8O7s1qTcwCIy9BlTg99pfkgUxrqCxtKyQ cfTM7hWlefa8YWcS4JcCewVPCg+ZnKWA0fMTqKViSYtXjR65QHsVC/zij L+gV5YtvmZHECO9ADefAPxVgi0/cpIa/DZ4q+XdZUcoKXxgtAnau+K0IF AF13JEGnokO4ohBa4IJ6bMUwtWOp+vduYdZDz8HG6d8SmhHUy5rXGl+Nb Ne50e2T8xcrbcxqwt5CF9ScawJdc23GXYzbYBYdE+1DkWI//aPXod3SXx A==; X-IronPort-AV: E=McAfee;i="6200,9189,10219"; a="240478013" X-IronPort-AV: E=Sophos;i="5.88,270,1635231600"; d="scan'208";a="240478013" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jan 2022 11:25:53 -0800 X-IronPort-AV: E=Sophos;i="5.88,270,1635231600"; d="scan'208";a="527478590" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.36.93]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jan 2022 11:25:53 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Geliang Tang , davem@davemloft.net, kuba@kernel.org, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 3/3] mptcp: reuse __mptcp_make_csum in validate_data_csum Date: Fri, 7 Jan 2022 11:25:24 -0800 Message-Id: <20220107192524.445137-4-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220107192524.445137-1-mathew.j.martineau@linux.intel.com> References: <20220107192524.445137-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch reused __mptcp_make_csum() in validate_data_csum() instead of open-coding. Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- net/mptcp/subflow.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 5bedc7e88977..bea47a1180dc 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -845,9 +845,8 @@ static enum mapping_status validate_data_csum(struct so= ck *ssk, struct sk_buff * bool csum_reqd) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); - struct csum_pseudo_header header; u32 offset, seq, delta; - __wsum csum; + u16 csum; int len; =20 if (!csum_reqd) @@ -908,13 +907,11 @@ static enum mapping_status validate_data_csum(struct = sock *ssk, struct sk_buff * * while the pseudo header requires the original DSS data len, * including that */ - header.data_seq =3D cpu_to_be64(subflow->map_seq); - header.subflow_seq =3D htonl(subflow->map_subflow_seq); - header.data_len =3D htons(subflow->map_data_len + subflow->map_data_fin); - header.csum =3D 0; - - csum =3D csum_partial(&header, sizeof(header), subflow->map_data_csum); - if (unlikely(csum_fold(csum))) { + csum =3D __mptcp_make_csum(subflow->map_seq, + subflow->map_subflow_seq, + subflow->map_data_len + subflow->map_data_fin, + subflow->map_data_csum); + if (unlikely(csum)) { MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DATACSUMERR); subflow->send_mp_fail =3D 1; MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_MPFAILTX); --=20 2.34.1