nl80211: Add SOCKET_OWNER support to START_AP

Signed-off-by: Denis Kenzior <denkenz@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 98eb37def37d1aa5978804c7f78887a09463ed59..9ea3d6039eca1104007fbb57798528174842d619 100644 (file)
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -1966,6 +1966,8 @@ enum nl80211_commands {
  *     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.
+ *     If set during %NL80211_CMD_START_AP the AP will be automatically
+ *     disabled 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/ap.c b/net/wireless/ap.c
index 63682176c96cb969137b5b6e857b8bbe361f3fea..882d97bdc6bfd49ac3acf80f5674821b15f46e35 100644 (file)
--- a/net/wireless/ap.c
+++ b/net/wireless/ap.c
@@ -27,6 +27,7 @@ int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev,
 
        err = rdev_stop_ap(rdev, dev);
        if (!err) {
+               wdev->conn_owner_nlportid = 0;
                wdev->beacon_interval = 0;
                memset(&wdev->chandef, 0, sizeof(wdev->chandef));
                wdev->ssid_len = 0;

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 1d6e81e5b2c8a27c7922949f5e6d26b177f52207..cfaf2aeb978352a5ca942b0533ab97b1a305fd3e 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4134,6 +4134,9 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
                wdev->chandef = params.chandef;
                wdev->ssid_len = params.ssid_len;
                memcpy(wdev->ssid, params.ssid, wdev->ssid_len);
+
+               if (info->attrs[NL80211_ATTR_SOCKET_OWNER])
+                       wdev->conn_owner_nlportid = info->snd_portid;
        }
        wdev_unlock(wdev);