From patchwork Thu May 27 23:54:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mat Martineau X-Patchwork-Id: 1484936 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.dev (client-ip=147.75.197.195; helo=ewr.edge.kernel.org; envelope-from=mptcp+bounces-799-incoming=patchwork.ozlabs.org@lists.linux.dev; receiver=) Received: from ewr.edge.kernel.org (ewr.edge.kernel.org [147.75.197.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Frl6V30Mlz9sWY for ; Fri, 28 May 2021 09:54:42 +1000 (AEST) 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 ewr.edge.kernel.org (Postfix) with ESMTPS id 3703F1C0DC2 for ; Thu, 27 May 2021 23:54:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 81AA36D0D; Thu, 27 May 2021 23:54:38 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 1A63929CA for ; Thu, 27 May 2021 23:54:37 +0000 (UTC) IronPort-SDR: BFjMMsFceZu7g1xU+MjH8r9bLE7XKhFz7WLojpgwYEw6RC/u3GzIt9mL0QyKhyqLBMAbji2hUG 0O6psVRVVk0A== X-IronPort-AV: E=McAfee;i="6200,9189,9997"; a="288450516" X-IronPort-AV: E=Sophos;i="5.83,228,1616482800"; d="scan'208";a="288450516" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 May 2021 16:54:36 -0700 IronPort-SDR: GE8KJMkWMam7ImRErhAOCpq8IrS2BMUF4hQBsggUhUalaDzsHy5DL/KdA7x1b6esFWXKPdEbav KMCrUH8xg+lA== X-IronPort-AV: E=Sophos;i="5.83,228,1616482800"; d="scan'208";a="443774249" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.84.136]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 May 2021 16:54:35 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Mat Martineau , davem@davemloft.net, kuba@kernel.org, matthieu.baerts@tessares.net, mptcp@lists.linux.dev Subject: [PATCH net-next 0/7] mptcp: Miscellaneous cleanup Date: Thu, 27 May 2021 16:54:23 -0700 Message-Id: <20210527235430.183465-1-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.31.1 X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Here are some cleanup patches we've collected in the MPTCP tree. Patches 1-4 do some general tidying. Patch 5 adds an explicit check at netlink command parsing time to require a port number when the 'signal' flag is set, to catch the error earlier. Patches 6 & 7 fix up the MPTCP 'enabled' sysctl, enforcing it as a boolean value, and ensuring that the !CONFIG_SYSCTL build still works after the boolean change. Jianguo Wu (5): mptcp: fix pr_debug in mptcp_token_new_connect mptcp: using TOKEN_MAX_RETRIES instead of magic number mptcp: generate subflow hmac after mptcp_finish_join() mptcp: remove redundant initialization in pm_nl_init_net() mptcp: make sure flag signal is set when add addr with port Matthieu Baerts (2): mptcp: support SYSCTL only if enabled mptcp: restrict values of 'enabled' sysctl Documentation/networking/mptcp-sysctl.rst | 8 ++--- net/mptcp/ctrl.c | 36 +++++++++++++++++------ net/mptcp/pm_netlink.c | 15 ++++++++-- net/mptcp/protocol.h | 2 ++ net/mptcp/subflow.c | 8 ++--- net/mptcp/token.c | 9 +++--- 6 files changed, 53 insertions(+), 25 deletions(-) base-commit: 91b17a436759e9f3a6f9ff090693564c3299cd9a