From patchwork Mon Mar 26 17:16:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 10308341 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D4FF260212 for ; Mon, 26 Mar 2018 17:17:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C467829162 for ; Mon, 26 Mar 2018 17:17:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8C5D297AE; Mon, 26 Mar 2018 17:17:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BF7829162 for ; Mon, 26 Mar 2018 17:17:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752627AbeCZRRD (ORCPT ); Mon, 26 Mar 2018 13:17:03 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:39933 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752173AbeCZRQ2 (ORCPT ); Mon, 26 Mar 2018 13:16:28 -0400 Received: by mail-oi0-f66.google.com with SMTP id q71-v6so16726093oic.6 for ; Mon, 26 Mar 2018 10:16:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=asIJjCXTQugLZXEwbMfvZ8/oKyb+EihCISlHrHx99FQ=; b=Fw/aMqaYmNQ9USVP/gs5jU6jF5YOiLCXKSiEDWx/7z7Xmqy55PSI2W3sQUB2Y08QKp qgCB+iVmijdihwskLFJU1YuYJMiN0Ny3Fl0Mh8SYXoXNyAlsDlPH9iHbctV3Pc24rzI9 qtUwBIIweYvAIZh3/iwaLL8CsBsl/qTCCem8Jk6XDAHSzN/VsxqLuzku7xX5IFY+Z7zn +jVimNOab8ibrUqAYzO+UvDm7z2dH4oK7Q7l07VH9sCzpGpDFEntmhViHSS1R4uf4HmV 6HYYwLqoNYBAc59JvVggEyNtfShXxYhHvElESXpoXksIIKcSeWtlxDnNzkYPnFj23xnL YtPg== 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:in-reply-to :references; bh=asIJjCXTQugLZXEwbMfvZ8/oKyb+EihCISlHrHx99FQ=; b=Weph8iLdHx8x5cS26puZybxWulRf/XlMSrXWyv/f3d6as9WQC7IaGA3/CsYPiqgXME f6U3OVNrtJTg4SIm3wtrT9Qaea6O/nrS80A2GL2kmLJlBY+JqvmvkBjLvVBMSOX2H4gt sgkJTxBXDJQEJgcAM3W7gwrfJ514VAonCT4qpm7B6GSxAvn28Xzti+mcgwGiSkS+zl1y A3ritxkyKsWg2XBrCW+82PIDfXSrTpyaLSt+luz/8IcW0+1poRWgX5V3DQhiH1e6MYBh r+ibICPtDqx5uFrg3X4G+2Rj+oPP93OU7vI5uJKEgD4fgfsI5f1wQZ+d50cXYjovNJLz 51sA== X-Gm-Message-State: AElRT7FXpJoVqB9bs1ofkEwbxNvIF1wZvTlPPDpzi6tt2+xSCbRAB6it x4mMwmZGNYG6WRu3YoiA+z8NNw== X-Google-Smtp-Source: AG47ELuCc1R/M37Ce2kbgZYbS/L3RYrGLbqnDUC2AJnccendBdySW6pZqmkBio7Syh3F7XvpyHnMHg== X-Received: by 10.202.166.84 with SMTP id p81mr19129966oie.149.1522084587724; Mon, 26 Mar 2018 10:16:27 -0700 (PDT) Received: from new-host-2.home (cpe-70-114-247-242.austin.res.rr.com. [70.114.247.242]) by smtp.gmail.com with ESMTPSA id c3-v6sm9426996otk.8.2018.03.26.10.16.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Mar 2018 10:16:27 -0700 (PDT) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [RFC v6 06/11] nl80211: Add SOCKET_OWNER support to JOIN_MESH Date: Mon, 26 Mar 2018 12:16:09 -0500 Message-Id: <20180326171614.20373-7-denkenz@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20180326171614.20373-1-denkenz@gmail.com> References: <20180326171614.20373-1-denkenz@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Denis Kenzior --- include/uapi/linux/nl80211.h | 2 ++ net/wireless/mesh.c | 1 + net/wireless/nl80211.c | 10 +++++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 877fab2836ec..e3329bc4644b 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -1987,6 +1987,8 @@ enum nl80211_commands { * station will deauthenticate when the socket is closed. * If set during %NL80211_CMD_JOIN_IBSS the IBSS will be automatically * torn down when the socket is closed. + * If set during %NL80211_CMD_JOIN_MESH the mesh setup will be + * automatically torn down when the socket is closed. * * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is * the TDLS link initiator. diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c index b12da6ef3c12..e91a5078615b 100644 --- a/net/wireless/mesh.c +++ b/net/wireless/mesh.c @@ -286,6 +286,7 @@ int __cfg80211_leave_mesh(struct cfg80211_registered_device *rdev, err = rdev_leave_mesh(rdev, dev); if (!err) { + wdev->conn_owner_nlportid = 0; wdev->mesh_id_len = 0; wdev->beacon_interval = 0; memset(&wdev->chandef, 0, sizeof(wdev->chandef)); diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 2f630ee3240b..05b903958894 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -10153,7 +10153,15 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info) setup.userspace_handles_dfs = nla_get_flag(info->attrs[NL80211_ATTR_HANDLE_DFS]); - return cfg80211_join_mesh(rdev, dev, &setup, &cfg); + err = cfg80211_join_mesh(rdev, dev, &setup, &cfg); + + if (!err && info->attrs[NL80211_ATTR_SOCKET_OWNER]) { + wdev_lock(dev->ieee80211_ptr); + dev->ieee80211_ptr->conn_owner_nlportid = info->snd_portid; + wdev_unlock(dev->ieee80211_ptr); + } + + return err; } static int nl80211_leave_mesh(struct sk_buff *skb, struct genl_info *info)