From patchwork Fri Mar 20 00:41:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mat Martineau X-Patchwork-Id: 1258550 X-Patchwork-Delegate: matthieu.baerts@tessares.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=198.145.21.10; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48k4j30h5Cz9sPF for ; Fri, 20 Mar 2020 11:41:41 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 196BD10FC36E7; Thu, 19 Mar 2020 17:42:30 -0700 (PDT) Received-SPF: None (mailfrom) identity=mailfrom; client-ip=134.134.136.24; helo=mga09.intel.com; envelope-from=mathew.j.martineau@linux.intel.com; receiver= Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id AB32C10FC340C for ; Thu, 19 Mar 2020 17:42:27 -0700 (PDT) IronPort-SDR: Vbtz7pjZLdBrJfuPLtpYMAbXdLYPy1cn+RphldZRRYT6SljxPIwJH46/qi+QNDjbPQcwLts2vt cQIGEZDKprVA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Mar 2020 17:41:36 -0700 IronPort-SDR: wpZVxjuAzYGMUuTwUgpucUxwFjLPFx+47447ZmU+RjWieXx9V3UoRg/BC7wB7XEc3mUZxIKPrO ieMZm2Bq//6Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,573,1580803200"; d="scan'208";a="268919087" Received: from mjmartin-nuc02.mjmartin-nuc02 (HELO mjmartin-nuc02.sea.intel.com) ([10.254.106.3]) by fmsmga004.fm.intel.com with ESMTP; 19 Mar 2020 17:41:36 -0700 From: Mat Martineau To: mptcp@lists.01.org Cc: Mat Martineau Date: Thu, 19 Mar 2020 17:41:22 -0700 Message-Id: <20200320004122.91365-1-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.25.2 MIME-Version: 1.0 Message-ID-Hash: CFBDF4JNUHH2MOUR2SDWMXLRDDMQBGH7 X-Message-ID-Hash: CFBDF4JNUHH2MOUR2SDWMXLRDDMQBGH7 X-MailFrom: mathew.j.martineau@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [PATCH] squash-to: mptcp: Add path manager interface List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Move some minor changes from "mptcp: Implement path manager interface commands" to reduce churn within the patch set. Does not cause conflicts later in the series. Signed-off-by: Mat Martineau --- net/mptcp/pm.c | 2 +- net/mptcp/protocol.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index f17db5517544..ad837da0193d 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -99,7 +99,7 @@ void mptcp_pm_data_init(struct mptcp_sock *msk) WRITE_ONCE(msk->pm.addr_signal, false); WRITE_ONCE(msk->pm.accept_addr, false); WRITE_ONCE(msk->pm.accept_subflow, false); - msk->pm.status = MPTCP_PM_IDLE; + msk->pm.status = 0; spin_lock_init(&msk->pm.lock); INIT_WORK(&msk->pm.work, pm_worker); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 9f9e397eee1e..8d4761ae3951 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -99,7 +99,6 @@ struct mptcp_addr_info { }; enum mptcp_pm_status { - MPTCP_PM_IDLE, MPTCP_PM_ADD_ADDR_RECEIVED, MPTCP_PM_ESTABLISHED, MPTCP_PM_SUBFLOW_ESTABLISHED, @@ -124,7 +123,7 @@ struct mptcp_pm_data { u8 add_addr_accept_max; u8 local_addr_max; u8 subflows_max; - enum mptcp_pm_status status; + u8 status; struct work_struct work; };