nl80211/cfg80211: Add crypto settings into NEW_BEACON

This removes need from drivers to parse the beacon tail/head data
to figure out what crypto settings are to be used in AP mode in case
the Beacon and Probe Response frames are fully constructed in the
driver/firmware.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 21 insertions, 0 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index fbb63d3ddc78..6e57a3afb609 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -23,6 +23,12 @@
 #include "nl80211.h"
 #include "reg.h"
 
+static bool nl80211_valid_auth_type(enum nl80211_auth_type auth_type);
+static int nl80211_crypto_settings(struct cfg80211_registered_device *rdev,
+                                   struct genl_info *info,
+                                   struct cfg80211_crypto_settings *settings,
+                                   int cipher_limit);
+
 static int nl80211_pre_doit(struct genl_ops *ops, struct sk_buff *skb,
                             struct genl_info *info);
 static void nl80211_post_doit(struct genl_ops *ops, struct sk_buff *skb,
@@ -2039,6 +2045,21 @@ static int nl80211_addset_beacon(struct sk_buff *skb, struct genl_info *info)
                                 return -EINVAL;
                 }
 
+                params.privacy = !!info->attrs[NL80211_ATTR_PRIVACY];
+
+                if (info->attrs[NL80211_ATTR_AUTH_TYPE]) {
+                        params.auth_type = nla_get_u32(
+                                info->attrs[NL80211_ATTR_AUTH_TYPE]);
+                        if (!nl80211_valid_auth_type(params.auth_type))
+                                return -EINVAL;
+                } else
+                        params.auth_type = NL80211_AUTHTYPE_AUTOMATIC;
+
+                err = nl80211_crypto_settings(rdev, info, &params.crypto,
+                                              NL80211_MAX_NR_CIPHER_SUITES);
+                if (err)
+                        return err;
+
                 call = rdev->ops->add_beacon;
                 break;
         case NL80211_CMD_SET_BEACON: