From nobody Thu Apr 25 09:21:09 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:d02:0:0:0:0 with SMTP id q2csp872197jaj; Thu, 2 Sep 2021 00:01:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxntvLXsFJ2Jpb2NARSwWqEwS9JavFtjBPS7O3MOKuAySrdiX403FKLIHZCONtUYdR+p8kv X-Received: by 2002:a05:6a00:8c3:b0:3fd:4333:897 with SMTP id s3-20020a056a0008c300b003fd43330897mr1865398pfu.67.1630566105711; Thu, 02 Sep 2021 00:01:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630566105; cv=none; d=google.com; s=arc-20160816; b=E2hH2BCZ6BSlSztM5uEUZ1Hp5ET1vLl+KLzzqtpRbVKeHYtp5gVE+MQYGFbKQBiP/6 LidTvR3dO8vIJRTuPzl3oPDZsgVBU53WSsg9i0pkT9HbZU+cjaZv4BcNrZYE+rY3J3d1 OvczyKY44Hz+x2OH9H4ag1bgM9S58zrDcWBS414fhjCO7KszXZZzYkTSdicQ+PAxr6/i 860TsPQE6xlZW4N4hsrqXGjLXebtqbxUpi4dKsx9QROTYg6rd4xS9vemK4dAkFfklCUI Mi8mF9zQwAM5aoHhEPD2um8Bclry/PttxKJMS9nR9elLzDcJc1X+NiBsiKJcZO7LrPZo nXNw== 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:message-id:date:subject:cc:to :from:dkim-signature; bh=8XwKyRAUDGY4JUeaDKAMif9csc/nwuvAGPGqLT6WPGM=; b=E7QxMSUJyBlci6aiB3BD73ZTyeXR5o16LBUZk4a8iM6k9cpeT8rmI+3tqUG6vfrVB5 3QZTnOOyzBiC6chvoAMvg5WdGdmQsNmGPWNBPMXrJZz4SnEPgHi/dlio33y3wJRSFuX2 kfdMQtgfbdKXfbIDWKNuMWpuGbwhqTuZtdF6iWOfhixWBDR9/dee5gP9M60lu9exV0uR tZkTL4uEBg80i9E1h+CvM464BahzsXjkrX0KmBT4X+M3ncahAMDQeh7V/GEHElVcRqWJ 4JEDwOgGghs+NnGVGpga+RuBjpAEtsH2KyDittvOCQPVT7UbWS6/sLrI2CREA0hjLori Bf6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=GzKdwTN3; spf=pass (google.com: domain of mptcp+bounces-1807-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-1807-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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 f189si1473650pfg.308.2021.09.02.00.01.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Sep 2021 00:01:45 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-1807-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=@gmail.com header.s=20210112 header.b=GzKdwTN3; spf=pass (google.com: domain of mptcp+bounces-1807-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-1807-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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 9C0A73E046E for ; Thu, 2 Sep 2021 07:01:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5B3FB2F80; Thu, 2 Sep 2021 07:01:43 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72BF13FC1 for ; Thu, 2 Sep 2021 07:01:42 +0000 (UTC) Received: by mail-pj1-f51.google.com with SMTP id w19-20020a17090aaf9300b00191e6d10a19so777597pjq.1 for ; Thu, 02 Sep 2021 00:01:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8XwKyRAUDGY4JUeaDKAMif9csc/nwuvAGPGqLT6WPGM=; b=GzKdwTN3MI06Yy6Uoq35pVjrvuttjdOyjw604EgibJ7i2F2HoUIiJzWzKkfzk2v/kz hKTw8/0YDeCT4Wsp3sIylO7au9Xhb6n9pkNPi8txtKIn20Etji2IlDKUsTWYQzxCwi4q js4BGvjh1xvNeAhTLRi4mPQEA3FVeobQn2L/oL5qk78WX9sFIDgs8zR73rnCl39Mq6BP ovHMMR8p1AGin9Uew1X1dku8EmWodg3Hn9Fkg0/3lvZmS5PyxciIDaQby0uaels3NWjp lo7IuL5x8sDo1VE/Q4XZLXTGLS7Jv0mh1Nbtjhq3tHwZe1Gu1/f8RP6W/+ZqM81xwAI6 8Rtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8XwKyRAUDGY4JUeaDKAMif9csc/nwuvAGPGqLT6WPGM=; b=Fj0zwKm+cjzOKxEzt8BODGyZHO/3OpctYah/R7YUbrJdRQNy/a37mFRZ4arE6c9ZUN kFAGmCbte+t/BW79KoVApNflhTsML7grFntmYbCWS9mhvKEs9k1F/Z1KYqq0m2vDzN+Y n1UaUT02mOUU9+MekL5bvIDloSe5DNGlMXaslWLcrftwVDzvQpExSU28hBiEcPsN7MeK XSDKwRe2TqME71rbmUN64DiB+E3H2k+p2fwOcuchuhQzbon+HGv031qDFKKADhFGeshy 1HkyfRcTZkoWQTQKyZR2uX4+iq2pHG4c0PB+C3G80o06H5CTa8Mnv2K2M/qL9ky9g/gm oC/g== X-Gm-Message-State: AOAM532A7Vd751Z/58WlkWx1Adki5CDLBMaKDsZPz39ncimRxf5Eo53b K5sggDmHNBDuHo0RkaruUrGiG/SOHQk= X-Received: by 2002:a17:90a:fb96:: with SMTP id cp22mr2278745pjb.211.1630566101828; Thu, 02 Sep 2021 00:01:41 -0700 (PDT) Received: from MiBook.. ([209.9.72.213]) by smtp.gmail.com with ESMTPSA id o1sm1101503pjk.1.2021.09.02.00.01.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Sep 2021 00:01:41 -0700 (PDT) From: Geliang Tang To: mptcp@lists.linux.dev, geliangtang@gmail.com Cc: Geliang Tang Subject: [MPTCP][PATCH mptcp-next] mptcp: use OPTIONS_MPTCP_MPC Date: Thu, 2 Sep 2021 15:00:19 +0800 Message-Id: <213e62f81b8daf3309039a0679a6925c5122b0b2.1630565830.git.geliangtang@xiaomi.com> X-Mailer: git-send-email 2.31.1 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 Since OPTIONS_MPTCP_MPC has been defined, use it instead of open-coding. Signed-off-by: Geliang Tang Acked-by: Paolo Abeni --- net/mptcp/options.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 1ec6529c4326..cf4ef11916c9 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -749,8 +749,7 @@ static bool mptcp_established_options_mp_prio(struct so= ck *sk, * 'backup'. Also it makes no sense at all */ if (!subflow->send_mp_prio || - ((OPTION_MPTCP_MPC_SYN | OPTION_MPTCP_MPC_SYNACK | - OPTION_MPTCP_MPC_ACK) & opts->suboptions)) + (OPTIONS_MPTCP_MPC & opts->suboptions)) return false; =20 /* account for the trailing 'nop' option */ @@ -1327,8 +1326,7 @@ void mptcp_write_options(__be32 *ptr, const struct tc= p_sock *tp, TCPOPT_NOP << 8 | TCPOPT_NOP, ptr); } } - } else if ((OPTION_MPTCP_MPC_SYN | OPTION_MPTCP_MPC_SYNACK | - OPTION_MPTCP_MPC_ACK) & opts->suboptions) { + } else if (OPTIONS_MPTCP_MPC & opts->suboptions) { u8 len, flag =3D MPTCP_CAP_HMAC_SHA256; =20 if (OPTION_MPTCP_MPC_SYN & opts->suboptions) { --=20 2.31.1