linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Denis Kenzior <denkenz@gmail.com>
To: linux-wireless@vger.kernel.org
Cc: Denis Kenzior <denkenz@gmail.com>
Subject: [PATCH v7 06/11] nl80211: Add SOCKET_OWNER support to JOIN_MESH
Date: Mon, 26 Mar 2018 12:52:46 -0500	[thread overview]
Message-ID: <20180326175251.20666-7-denkenz@gmail.com> (raw)
In-Reply-To: <20180326175251.20666-1-denkenz@gmail.com>

Signed-off-by: Denis Kenzior <denkenz@gmail.com>
---
 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)
-- 
2.13.5

  parent reply	other threads:[~2018-03-26 17:53 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-26 17:52 [PATCH v7 00/11] EAPoL over NL80211 Denis Kenzior
2018-03-26 17:52 ` [PATCH v7 01/11] nl80211: Add CMD_CONTROL_PORT_FRAME API Denis Kenzior
2018-03-26 17:52 ` [PATCH v7 02/11] nl80211: Implement TX of control port frames Denis Kenzior
2018-03-26 17:52 ` [PATCH v7 03/11] nl80211: Add CONTROL_PORT_OVER_NL80211 attribute Denis Kenzior
2018-03-26 17:52 ` [PATCH v7 04/11] cfg80211: Support all iftypes in autodisconnect_wk Denis Kenzior
2018-03-26 17:52 ` [PATCH v7 05/11] nl80211: Add SOCKET_OWNER support to JOIN_IBSS Denis Kenzior
2018-03-26 17:52 ` Denis Kenzior [this message]
2018-03-26 17:52 ` [PATCH v7 07/11] nl80211: Add SOCKET_OWNER support to START_AP Denis Kenzior
2018-03-26 17:52 ` [PATCH v7 08/11] nl80211: Add control_port_over_nl80211 for ibss Denis Kenzior
2018-03-26 17:52 ` [PATCH v7 09/11] nl80211: Add control_port_over_nl80211 to mesh_setup Denis Kenzior
2018-03-26 17:52 ` [PATCH v7 10/11] mac80211: Add support for tx_control_port Denis Kenzior
2018-03-26 17:52 ` [PATCH v7 11/11] mac80211: Send control port frames over nl80211 Denis Kenzior
2018-03-27  8:03 ` [PATCH v7 00/11] EAPoL over NL80211 Arend van Spriel
2018-03-27 14:42   ` Denis Kenzior
2018-03-27 20:51     ` Arend van Spriel
2018-03-29 12:44 ` Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180326175251.20666-7-denkenz@gmail.com \
    --to=denkenz@gmail.com \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).