From nobody Sun Feb 8 18:32:49 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:cbb9:0:0:0:0:0 with SMTP id v25csp10559794jap; Wed, 24 Nov 2021 08:22:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJyO3+F2t0L1B2TReOmRDhBfs46vWqmisOyg6XQgKaqv0poNGxuZ1AKrSNnJZxP4d5Dy4nJv X-Received: by 2002:a05:6638:339b:: with SMTP id h27mr17388548jav.4.1637770958244; Wed, 24 Nov 2021 08:22:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637770958; cv=none; d=google.com; s=arc-20160816; b=oJ2+i0qejBzw90isv0vsHoFv0hbBDMlHYBq5N/OR9HReBhzinsdSOAbhiMQSpM5dXi WleMCemI7x3fWqZtiAVc919uUHISR1RbY79JtsTSbGctBAHJ42k5mwPDcqjAtkJ0agZh gVgxBY92/m6EBPWstXlCm+K1eVJzIig06uNs4c1GZO0gfd+QXKV0AfTsQYEPhL7vnqzd TWJW1V+pElWEYxQ6nc1uAeW+ne2vUscQAnnPa7Exxn7lQxXohQwVFd4g/65fp6N35j51 B2SMkIJCJXIMuDvL9PgH/WzDyllnUA44x7kfmDS/8UVwqEQlrXgI2SnL1TbVNF8wguGx Etxw== 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=R1mY7UFdQVRSDeafvZWZ10zEPnX1i9Jjr2qNMeJH7g8=; b=px2iLWYAFvjE4jMB6NaNIDjYbL3zsfp76mXPvTRQU/GNWvlYT+8RKJdMnvNmC6bk0c 8NQPlsyZAhiE3NSzrTGgtiLfSUSdx+hYBsN8lx6llsn/9Sh0zvKxcJ5NoY9seE3WIqC4 eggsJA6q4zGoUh1uYvkRO9YmefRXZ9qz9luSRH4qkeg24JoBYjMfIC+AxwDECQdseHyG NR6T7xFkpXVFYhY/0WrBfkHQ0dwDkiPPv62rtZduiBCFvekQg1ZNv7pK2ayJ/kdcXg1a ry5cyrcCjanJKKTwyy1Gb9uFhQRLu15zMrJownGl/VyxzBdzuUCGsp180ksaXZiIYl+G KAxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dlktGQVP; spf=pass (google.com: domain of mptcp+bounces-2532-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2532-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 201si408308pgb.382.2021.11.24.08.22.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Nov 2021 08:22:38 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2532-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=dlktGQVP; spf=pass (google.com: domain of mptcp+bounces-2532-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2532-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 6DD9E3E1092 for ; Wed, 24 Nov 2021 16:22:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 503EB2C86; Wed, 24 Nov 2021 16:22:36 +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.133.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 1CBAC2C83 for ; Wed, 24 Nov 2021 16:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637770954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc: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=dlktGQVPXDobL7HyuuCVsdBGyWqxlyGcxJVpnx9/mvuHhbdc3/ZdneUqaobyasQIVS9+Fl NTV8191GxZyAszdD02vnLLwqbybObo+CwGa++tobJwK4n/qVKgzKcu94stweNXlJjrNxQJ 9sjPIgSZLvgRbkiJ+b1uhadTYuN9G4I= 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-494-PstaAEmtO26XtNzBU0PO_Q-1; Wed, 24 Nov 2021 11:22:31 -0500 X-MC-Unique: PstaAEmtO26XtNzBU0PO_Q-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2EEBA801B2A; Wed, 24 Nov 2021 16:22:30 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.176]) by smtp.corp.redhat.com (Postfix) with ESMTP id 548181002388; Wed, 24 Nov 2021 16:22:29 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Cc: Phil Greenland Subject: [PATCH mptcp-next v2 1/4] mptcp: clean-up MPJ option writing. Date: Wed, 24 Nov 2021 17:22:11 +0100 Message-Id: <5e98a57b75ff1d45305bc5b6ba7fcbd24d355b65.1637770883.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.22 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