From patchwork Tue Mar 13 21:59:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 10280999 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 5E697602C2 for ; Tue, 13 Mar 2018 22:00:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4DFE32821F for ; Tue, 13 Mar 2018 22:00:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42D4F28538; Tue, 13 Mar 2018 22:00:06 +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 DBAC12821F for ; Tue, 13 Mar 2018 22:00:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752959AbeCMWAD (ORCPT ); Tue, 13 Mar 2018 18:00:03 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:38671 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752778AbeCMWAC (ORCPT ); Tue, 13 Mar 2018 18:00:02 -0400 Received: by mail-pf0-f195.google.com with SMTP id d26so491151pfn.5 for ; Tue, 13 Mar 2018 15:00:01 -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=8NOYG+cfULg9CNKyayhBRZwTdqE3tKtgTjPV9LEgflw=; b=Fch42RYKgKW6plWmpSQgrOfGfWNjmnVl4nBxDqMuKz+GADomgynRMwzTAy1ayFyA+N /QGTIdcQX7E0um8XSqG4YWrkrW7fF66z75vAzm7P7oLz/XDSeTtPamP86hzGTbGkv7Uv SRuno1VGZ9dT2eJ0l8Ldx/MH+O8oBOzf2wbPEW8boR2P5aIft/iu/8AI1nrS7x6XHHZZ prf+C1GTAzz9tqr7KLT/VeO08A9CBHBh6B22PmKSAayFkX8SYOc79OZJBENKVvfa1hLQ N80fPszPUwXLbWNdXeQPTtfU+zJeu97bf3B1tpiuU43lhA7kcFe1/ZZLSviRn57CUzWU OcJg== 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=8NOYG+cfULg9CNKyayhBRZwTdqE3tKtgTjPV9LEgflw=; b=Cr4rM38QJgbaZc2gMsu7hedBfPdIOn4c9q3c2sVUZaM9H02Zl75YSANW8OQSTTWXya Cz4Hii5zv4z10E9x5Mr45q21Nm6HQBlQRwd9LIas/Q+vF85DC2ho9WvRqzH5CSSvh81V VTmW47G0WNzTAiNvZNFCCO7t21VwrqXsdHMSG+4t8eJB8E9nLQFKPAhgRkn0sZNkHjZf WXLpbNk3+Ybqgescq3W/bNekp/fJtAiy/dVoXuLGbh/5uzJI+CnD1zVVB7JEC8bXoSj8 9gxu9MqD1RcUzpuI50REi53QcI6NaOqXQ/tba/MjuYTmHbnV+xb0w43NiJzFu86EoZxs LQ7A== X-Gm-Message-State: AElRT7FWGq3pN5sKLwX3Gy6jZYJbPJu6Z63soI46vV31GuT58KuxCCn9 wKFB0VF/v4GpcInw7at5Ul8KCQ== X-Google-Smtp-Source: AG47ELscEtvpdnRNy4/uJZfxRS1dK8E6zSd99bKsbHdZsBL3MptThFyJupawrsuDYgauLOumwhqPGQ== X-Received: by 10.101.98.149 with SMTP id f21mr1664996pgv.7.1520978401309; Tue, 13 Mar 2018 15:00:01 -0700 (PDT) Received: from new-host-2.home.com ([192.55.54.44]) by smtp.gmail.com with ESMTPSA id j23sm1723474pfi.78.2018.03.13.15.00.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Mar 2018 15:00:00 -0700 (PDT) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [RFC v5 6/9] nl80211: Add SOCKET_OWNER support to JOIN_MESH Date: Tue, 13 Mar 2018 16:59:39 -0500 Message-Id: <20180313215942.29176-7-denkenz@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20180313215942.29176-1-denkenz@gmail.com> References: <20180313215942.29176-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 e678dc510f3a..e38d55cf34f7 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -10140,7 +10140,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)