From nobody Sun Feb 8 07:07:50 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp534306jap; Fri, 7 Jan 2022 11:25:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJwVgAqSi3MvyDipWqhhIoKyA9lQf23+xSN/LMcCVemFwM1lve0kwu8MNXAGA1QQ+0ZzRvQ8 X-Received: by 2002:a63:b955:: with SMTP id v21mr2408860pgo.374.1641583558195; Fri, 07 Jan 2022 11:25:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641583558; cv=none; d=google.com; s=arc-20160816; b=YU/1T/zjtTM3xmPUudd+eOgbmq++5q26Dc9dYSCIbItI2DEMp1TYa02IF9XZTqUoN/ lH2ee+JFHjY48SISjZ2WqMCh27EZ8QwG7KKIcUJD8pTU/qfg0jGlzgMvTg6mG2D2NfKJ 97Y72UwIfl8uX3DnM83FEvhAFM5ScG0f6mRyKpLstrxawiAdJXrTOzDDVY8hPdlcSEm9 OdIk38A6g+mXv/xHLXfQwMWUhjkUy3vGxwCEWDARfLYUIegcTCIRb5mtC1D4/ORIJOWO Tgt5Adfkhr1CvDu9ZjePI5OlrqkrPXnYEBGSj/g5/eI9jzxXu1TK4z4Xk3D4UoI4w1dZ E4lA== 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=eZ5dbb5PkVdf7ygmebZXfnLK5+8FuwH6z8fBw0+6u1E=; b=k6f9rLhIKmQj6Zsb6kbSY6Lke5PZd9OUV04dGDuzlNBb6gnqPypvBa0BXNRLUyJnoV hhxIlEZ5CzDLohyW4BCeO+m581OdeN8Uawg1Aiuvs619ZVYq+dMJ7ov54n/ZqWWjmznL VaPvBkkVCGLeMXWJAbOCVA2Z2VgOo6mK5TdiI2s8rGFReyhsAfkdDaf99UzeSREnVJy6 pAwrd6LD1VX8Z8IcrghgxIfNmkDpiDQjnbRrqcbgszGwQiCpspoTOeDnU1hYlUgh+c4H EbNHFvPQbDZcRbFKrZbDzKQB6dAkTvvvLfyksBllrj/3oAFfmYC0DWD1TlBWKABhJ4TE yH7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LRBrNEbY; spf=pass (google.com: domain of mptcp+bounces-2984-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2984-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id pf16si4713152pjb.145.2022.01.07.11.25.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jan 2022 11:25:58 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2984-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=@intel.com header.s=Intel header.b=LRBrNEbY; spf=pass (google.com: domain of mptcp+bounces-2984-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2984-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 sjc.edge.kernel.org (Postfix) with ESMTPS id BDF833E0F21 for ; Fri, 7 Jan 2022 19:25:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1D2152CA4; Fri, 7 Jan 2022 19:25:57 +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 005C52CA3 for ; Fri, 7 Jan 2022 19:25:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641583556; x=1673119556; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YKzjUf+5IIZ8MDyCvXc+81rmE6lK1eAM7jrYT8awB10=; b=LRBrNEbYyphBQAJUBWtxPqXAhPP/0JBZFBXO7mMnlNVCJJhIpp7NwxH3 cvpURqMxdmmpkVB+E7ywZcquWqEbj53tzHGIA9nyAwk0mfLKOKGF6/vuN tpeRmpfjFa9G12I0lc9UHy0OE8FN+1ZaelCznQXwWqjet0rvLLNOJf25V Dj0CAAm6gBQZD9PrOFvZZmmjU4PPoqb5TdesHn3X5TNM1AkbylwTnISHp XmesgE1popnxUzLwxREpx9yHUx7rg/OkimLyAKd+FWs9iTXzBiaqlaVW1 +2wwo+N1NRab383eo0YZqNE/qqgT0+INVAn3kqdFanWo+8eMZYwGRVuhe Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10219"; a="240478012" X-IronPort-AV: E=Sophos;i="5.88,270,1635231600"; d="scan'208";a="240478012" 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="527478588" 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 2/3] mptcp: change the parameter of __mptcp_make_csum Date: Fri, 7 Jan 2022 11:25:23 -0800 Message-Id: <20220107192524.445137-3-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 changed the type of the last parameter of __mptcp_make_csum() from __sum16 to __wsum. And export this function in protocol.h. Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- net/mptcp/options.c | 8 ++++---- net/mptcp/protocol.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 38e34a1fb2dd..8ed2d9f4a84d 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1233,7 +1233,7 @@ static void mptcp_set_rwin(const struct tcp_sock *tp) WRITE_ONCE(msk->rcv_wnd_sent, ack_seq); } =20 -static u16 __mptcp_make_csum(u64 data_seq, u32 subflow_seq, u16 data_len, = __sum16 sum) +u16 __mptcp_make_csum(u64 data_seq, u32 subflow_seq, u16 data_len, __wsum = sum) { struct csum_pseudo_header header; __wsum csum; @@ -1248,14 +1248,14 @@ static u16 __mptcp_make_csum(u64 data_seq, u32 subf= low_seq, u16 data_len, __sum1 header.data_len =3D htons(data_len); header.csum =3D 0; =20 - csum =3D csum_partial(&header, sizeof(header), ~csum_unfold(sum)); + csum =3D csum_partial(&header, sizeof(header), sum); return (__force u16)csum_fold(csum); } =20 static u16 mptcp_make_csum(const struct mptcp_ext *mpext) { return __mptcp_make_csum(mpext->data_seq, mpext->subflow_seq, mpext->data= _len, - mpext->csum); + ~csum_unfold(mpext->csum)); } =20 void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, @@ -1376,7 +1376,7 @@ void mptcp_write_options(__be32 *ptr, const struct tc= p_sock *tp, __mptcp_make_csum(opts->data_seq, opts->subflow_seq, opts->data_len, - opts->csum), ptr); + ~csum_unfold(opts->csum)), ptr); } else { put_unaligned_be32(opts->data_len << 16 | TCPOPT_NOP << 8 | TCPOPT_NOP, ptr); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index a77f512d5ad7..0e6b42c76ea0 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -725,6 +725,7 @@ void mptcp_token_destroy(struct mptcp_sock *msk); void mptcp_crypto_key_sha(u64 key, u32 *token, u64 *idsn); =20 void mptcp_crypto_hmac_sha(u64 key1, u64 key2, u8 *msg, int len, void *hma= c); +u16 __mptcp_make_csum(u64 data_seq, u32 subflow_seq, u16 data_len, __wsum = sum); =20 void __init mptcp_pm_init(void); void mptcp_pm_data_init(struct mptcp_sock *msk); --=20 2.34.1