From patchwork Mon Mar 26 17:52:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 10308445 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 9751F60325 for ; Mon, 26 Mar 2018 17:53:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8ACE7295C3 for ; Mon, 26 Mar 2018 17:53:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 774E9297BD; Mon, 26 Mar 2018 17:53:08 +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 170FB295C3 for ; Mon, 26 Mar 2018 17:53:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752705AbeCZRxG (ORCPT ); Mon, 26 Mar 2018 13:53:06 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:45933 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751908AbeCZRxE (ORCPT ); Mon, 26 Mar 2018 13:53:04 -0400 Received: by mail-oi0-f68.google.com with SMTP id 71-v6so16820585oie.12 for ; Mon, 26 Mar 2018 10:53:04 -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=QfZ0xd0ukDzLLUjdovQ67eJ4uLCt42vpCB2tWFeWs9n6/3SWejLUphem8dc3AXh/4a PgMQD6QBBPB/tCqQxZv6+9hkehvCZOiUAvrs16zrbjngyUVCWS/rAHP4pkZT0LXEniFg G0FgbbZegbd+UfOGjjzTqu2UUmhIny66J5wxuafLfcwMZeaTE/1aQlZsqgUhEo+Ky8u5 Gd+2M20PmStQbtx8KvvlnauiLLH1Li7aaNWaXB5Qo4UX6gwTRu48Vqm+G6/raYEB8IGv gKY29pN5Tl6tUrtaZe17Ar0UoK51+Kb2f1vpLqO9ucEkwSKw+OUM6Es1UFBl18zDWIQa PBsA== 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=aJ3cy2c8I5X7mGZt5cGx6lFOfqc3hr/d7IG8RuOuvnfGolw4FzhJR+85dedhAfKGE0 HC6D2khBoVJMjQ2nXjCwerQGJvOZZaenhq/fEMBxt+JMrTcUvXlqhVAFrJvTvOc1fj+2 Dwsna7zNr1AS5AVZhZ4X/TnqePM0E22X8iVVWfsz+ayNq+X9/ROlNUexedUbVE5pqRmN mLBLRavhvkI2m0X1ggpBsgFaNv+DDgfL/l9NSiDzFhajcwGjvGD1zIraX9V3WE4/YQcl gRNyYlphL7Wf36Jml9dX73gofgXilOSZ+JggYThlax5oIl8RQ9MOjVxIWt0Dm71r2V6E 8XqA== X-Gm-Message-State: AElRT7F4W6kf0ybxTNngNyVFjjZ6VnH/xKWJg+XXix/ZcVmVwhwGgGXU F9eTvX4m1GoZoFmXKbtdPvCScA== X-Google-Smtp-Source: AG47ELuCrq3RRD3GuHhSjHkzQFOQBsLo2xLZBkrsoKXtkgJ7ETpjqGOQJlx4KkzaEDGqK3FVMXg/7g== X-Received: by 10.202.108.73 with SMTP id h70mr22064376oic.282.1522086784278; Mon, 26 Mar 2018 10:53:04 -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 t1-v6sm9112952oth.75.2018.03.26.10.53.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Mar 2018 10:53:03 -0700 (PDT) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [PATCH v7 06/11] nl80211: Add SOCKET_OWNER support to JOIN_MESH Date: Mon, 26 Mar 2018 12:52:46 -0500 Message-Id: <20180326175251.20666-7-denkenz@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20180326175251.20666-1-denkenz@gmail.com> References: <20180326175251.20666-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)