1 files changed, 18 insertions, 7 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index eb4437fa0539..dc96077afe5e 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4550,6 +4550,9 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
 
         nl80211_calculate_ap_params(&params);
 
+        if (info->attrs[NL80211_ATTR_EXTERNAL_AUTH_SUPPORT])
+                params.flags |= AP_SETTINGS_EXTERNAL_AUTH_SUPPORT;
+
         wdev_lock(wdev);
         err = rdev_start_ap(rdev, dev, &params);
         if (!err) {
@@ -13086,7 +13089,9 @@ static int nl80211_external_auth(struct sk_buff *skb, struct genl_info *info)
         if (!rdev->ops->external_auth)
                 return -EOPNOTSUPP;
 
-        if (!info->attrs[NL80211_ATTR_SSID])
+        if (!info->attrs[NL80211_ATTR_SSID] &&
+            dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&
+            dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO)
                 return -EINVAL;
 
         if (!info->attrs[NL80211_ATTR_BSSID])
@@ -13097,18 +13102,24 @@ static int nl80211_external_auth(struct sk_buff *skb, struct genl_info *info)
 
         memset(&params, 0, sizeof(params));
 
-        params.ssid.ssid_len = nla_len(info->attrs[NL80211_ATTR_SSID]);
-        if (params.ssid.ssid_len == 0 ||
-            params.ssid.ssid_len > IEEE80211_MAX_SSID_LEN)
-                return -EINVAL;
-        memcpy(params.ssid.ssid, nla_data(info->attrs[NL80211_ATTR_SSID]),
-               params.ssid.ssid_len);
+        if (info->attrs[NL80211_ATTR_SSID]) {
+                params.ssid.ssid_len = nla_len(info->attrs[NL80211_ATTR_SSID]);
+                if (params.ssid.ssid_len == 0 ||
+                    params.ssid.ssid_len > IEEE80211_MAX_SSID_LEN)
+                        return -EINVAL;
+                memcpy(params.ssid.ssid,
+                       nla_data(info->attrs[NL80211_ATTR_SSID]),
+                       params.ssid.ssid_len);
+        }
 
         memcpy(params.bssid, nla_data(info->attrs[NL80211_ATTR_BSSID]),
                ETH_ALEN);
 
         params.status = nla_get_u16(info->attrs[NL80211_ATTR_STATUS_CODE]);
 
+        if (info->attrs[NL80211_ATTR_PMKID])
+                params.pmkid = nla_data(info->attrs[NL80211_ATTR_PMKID]);
+
         return rdev_external_auth(rdev, dev, &params);
 }