From nobody Sun Feb 8 17:13:00 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:cbb9:0:0:0:0:0 with SMTP id v25csp1803419jap; Fri, 26 Nov 2021 04:19:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJwPH6pdB42GYIEMqQYwus30XNkgoduslvrNwRoXYiI7U4mL2G00sBUACFqS2uKNT7kW8FFa X-Received: by 2002:a37:a1c1:: with SMTP id k184mr21687663qke.383.1637929164571; Fri, 26 Nov 2021 04:19:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637929164; cv=none; d=google.com; s=arc-20160816; b=reXg8nkQj78cjw/SuiSk9eBPUVB90dVG/XNEaqfDuqCwpu8TlHRfTd4TUdi+S17GzC djtm//CDJQ6xDAo9X9+09ja5nTR2VLZsvCI52q7TyU1up5GkKkWkuoYB+/zIX7EcQdjd D7W0170q+Sjguc9WlIMPJHu3Ywj47hMgVsDZOi9q+bpKq1KsorsPJ/U0upJ66T8JUN0k YO45knNjPxpD+UDiWz3Vh8cKkCgsBjOmFrq59elp1v8XzE+N9JEGQ1UuG7iViDm+bfbf /C++PSAFFOGuqo4leDP28SgbL56T+0bSWUw4eKD/lDMjHh8VE8rBZb8CseZP19JFQF2P KpGQ== 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=R1mY7UFdQVRSDeafvZWZ10zEPnX1i9Jjr2qNMeJH7g8=; b=dcyf93AGfyAaWdvrQtDodflQSv6ui3nybnWDu91YulS74R3s+9shMtSjeGzNJS+TQY u+Kx70GGjRMH2fo64X47ep7Iq5Vb2RPzOH5C/HnzbYL+QxhNvRqx35ww8ou2HbmYn+Mm BaoTJO+ujcp21PmqQP2GgIn+CBwDhFNeW7u8l4DclCKeAj+UL/5L84pD9mTIxjR1rYsw ukR+iZdrZSzPpUMC8vwJovUVT0HY6UTGOFiiOMpQSfy/iJp85+6Ni4q+vF5L/G/+iiEk RylYy/D/d83IyUbb2MSEhcZkA7y+f1TEaV5CbkZLsI02izar+KOKzXGkvJMD2X2fUSt5 JAvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=GO7Ml9aH; spf=pass (google.com: domain of mptcp+bounces-2547-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2547-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. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id i15si9157516vsf.786.2021.11.26.04.19.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Nov 2021 04:19:24 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2547-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=GO7Ml9aH; spf=pass (google.com: domain of mptcp+bounces-2547-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2547-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 59D5F3E10F4 for ; Fri, 26 Nov 2021 12:19:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5547C29CA; Fri, 26 Nov 2021 12:19:22 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 08B3968 for ; Fri, 26 Nov 2021 12:19:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637929159; 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=R1mY7UFdQVRSDeafvZWZ10zEPnX1i9Jjr2qNMeJH7g8=; b=GO7Ml9aHj+ygx41N+xlXuBLeJ6ug+xlFZhNKVvKNISvaRvsBhSZQz+ONTmcuQTW6T99IdB fKieJysQxtGx6kogYMuuitpm3QO+Z40fIRNILrh30TOEpGGjHrWsw1EQAW+BKHgX2tSdzz cW1L20RG3AL2b8BDKArmaSn7MB+II84= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-333-n9g8yoW8NmS5EXB1h1KpiQ-1; Fri, 26 Nov 2021 07:19:18 -0500 X-MC-Unique: n9g8yoW8NmS5EXB1h1KpiQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 02BBD1006AA0 for ; Fri, 26 Nov 2021 12:19:18 +0000 (UTC) Received: from gerbillo.fritz.box (unknown [10.39.194.163]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6600A19C46 for ; Fri, 26 Nov 2021 12:19:17 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-next 1/4] mptcp: clean-up MPJ option writing. Date: Fri, 26 Nov 2021 13:19:06 +0100 Message-Id: <4c5e9cc2a8997673798166249b66fef891fe9938.1637929034.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.84 on 10.5.11.23 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" Check for all MPJ variant at once, this reduces the number of conditionals traversed on average and will simplify the next patch. No functional change intended. Signed-off-by: Paolo Abeni --- net/mptcp/options.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 8a1020e4285c..7a6a39b71633 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1381,27 +1381,29 @@ void mptcp_write_options(__be32 *ptr, const struct = tcp_sock *tp, =20 /* MPC is additionally mutually exclusive with MP_PRIO */ goto mp_capable_done; - } else if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) { - *ptr++ =3D mptcp_option(MPTCPOPT_MP_JOIN, - TCPOLEN_MPTCP_MPJ_SYN, - opts->backup, opts->join_id); - put_unaligned_be32(opts->token, ptr); - ptr +=3D 1; - put_unaligned_be32(opts->nonce, ptr); - ptr +=3D 1; - } else if (OPTION_MPTCP_MPJ_SYNACK & opts->suboptions) { - *ptr++ =3D mptcp_option(MPTCPOPT_MP_JOIN, - TCPOLEN_MPTCP_MPJ_SYNACK, - opts->backup, opts->join_id); - put_unaligned_be64(opts->thmac, ptr); - ptr +=3D 2; - put_unaligned_be32(opts->nonce, ptr); - ptr +=3D 1; - } else if (OPTION_MPTCP_MPJ_ACK & opts->suboptions) { - *ptr++ =3D mptcp_option(MPTCPOPT_MP_JOIN, - TCPOLEN_MPTCP_MPJ_ACK, 0, 0); - memcpy(ptr, opts->hmac, MPTCPOPT_HMAC_LEN); - ptr +=3D 5; + } else if (OPTIONS_MPTCP_MPJ & opts->suboptions) { + if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) { + *ptr++ =3D mptcp_option(MPTCPOPT_MP_JOIN, + TCPOLEN_MPTCP_MPJ_SYN, + opts->backup, opts->join_id); + put_unaligned_be32(opts->token, ptr); + ptr +=3D 1; + put_unaligned_be32(opts->nonce, ptr); + ptr +=3D 1; + } else if (OPTION_MPTCP_MPJ_SYNACK & opts->suboptions) { + *ptr++ =3D mptcp_option(MPTCPOPT_MP_JOIN, + TCPOLEN_MPTCP_MPJ_SYNACK, + opts->backup, opts->join_id); + put_unaligned_be64(opts->thmac, ptr); + ptr +=3D 2; + put_unaligned_be32(opts->nonce, ptr); + ptr +=3D 1; + } else { + *ptr++ =3D mptcp_option(MPTCPOPT_MP_JOIN, + TCPOLEN_MPTCP_MPJ_ACK, 0, 0); + memcpy(ptr, opts->hmac, MPTCPOPT_HMAC_LEN); + ptr +=3D 5; + } } else if (OPTION_MPTCP_ADD_ADDR & opts->suboptions) { u8 len =3D TCPOLEN_MPTCP_ADD_ADDR_BASE; u8 echo =3D MPTCP_ADDR_ECHO; --=20 2.33.1