mwifiex: parse WPA IE and support WPA/WPA2 mixed mode for uAP

Add support for parsing WPA IE from beacon parameter of
cfg80211_ap_settings and set it to FW.

WPA/WPA2 mixed mode is supported with this patch.

Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Kiran Divekar <dkiran@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/mwifiex/ie.c b/drivers/net/wireless/mwifiex/ie.c
index ceb82cd749cc7ba1ca2054ae0b675802d2194190..328fb14d9e1409a8200c777090a8ec74a15d0376 100644 (file)
--- a/drivers/net/wireless/mwifiex/ie.c
+++ b/drivers/net/wireless/mwifiex/ie.c
@@ -224,29 +224,46 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
                         struct cfg80211_ap_settings *params)
 {
        struct mwifiex_ie *beacon_ie = NULL, *pr_ie = NULL;
-       struct mwifiex_ie *ar_ie = NULL, *rsn_ie = NULL;
-       struct ieee_types_header *ie = NULL;
+       struct mwifiex_ie *ar_ie = NULL, *gen_ie = NULL;
+       struct ieee_types_header *rsn_ie = NULL, *wpa_ie = NULL;
        u16 beacon_idx = MWIFIEX_AUTO_IDX_MASK, pr_idx = MWIFIEX_AUTO_IDX_MASK;
        u16 ar_idx = MWIFIEX_AUTO_IDX_MASK, rsn_idx = MWIFIEX_AUTO_IDX_MASK;
-       u16 mask;
+       u16 mask, ie_len = 0;
+       const u8 *vendor_ie;
        int ret = 0;
 
        if (params->beacon.tail && params->beacon.tail_len) {
-               ie = (void *)cfg80211_find_ie(WLAN_EID_RSN, params->beacon.tail,
-                                             params->beacon.tail_len);
-               if (ie) {
-                       rsn_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
-                       if (!rsn_ie)
-                               return -ENOMEM;
-
-                       rsn_ie->ie_index = cpu_to_le16(rsn_idx);
-                       mask = MGMT_MASK_BEACON | MGMT_MASK_PROBE_RESP |
-                              MGMT_MASK_ASSOC_RESP;
-                       rsn_ie->mgmt_subtype_mask = cpu_to_le16(mask);
-                       rsn_ie->ie_length = cpu_to_le16(ie->len + 2);
-                       memcpy(rsn_ie->ie_buffer, ie, ie->len + 2);
-
-                       if (mwifiex_update_uap_custom_ie(priv, rsn_ie, &rsn_idx,
+               gen_ie = kzalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
+               if (!gen_ie)
+                       return -ENOMEM;
+               gen_ie->ie_index = cpu_to_le16(rsn_idx);
+               mask = MGMT_MASK_BEACON | MGMT_MASK_PROBE_RESP |
+                      MGMT_MASK_ASSOC_RESP;
+               gen_ie->mgmt_subtype_mask = cpu_to_le16(mask);
+
+               rsn_ie = (void *)cfg80211_find_ie(WLAN_EID_RSN,
+                                                 params->beacon.tail,
+                                                 params->beacon.tail_len);
+               if (rsn_ie) {
+                       memcpy(gen_ie->ie_buffer, rsn_ie, rsn_ie->len + 2);
+                       ie_len = rsn_ie->len + 2;
+                       gen_ie->ie_length = cpu_to_le16(ie_len);
+               }
+
+               vendor_ie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,
+                                                   WLAN_OUI_TYPE_MICROSOFT_WPA,
+                                                   params->beacon.tail,
+                                                   params->beacon.tail_len);
+               if (vendor_ie) {
+                       wpa_ie = (struct ieee_types_header *)vendor_ie;
+                       memcpy(gen_ie->ie_buffer + ie_len,
+                              wpa_ie, wpa_ie->len + 2);
+                       ie_len += wpa_ie->len + 2;
+                       gen_ie->ie_length = cpu_to_le16(ie_len);
+               }
+
+               if (rsn_ie || wpa_ie) {
+                       if (mwifiex_update_uap_custom_ie(priv, gen_ie, &rsn_idx,
                                                         NULL, NULL,
                                                         NULL, NULL)) {
                                ret = -1;
@@ -319,7 +336,7 @@ done:
        kfree(beacon_ie);
        kfree(pr_ie);
        kfree(ar_ie);
-       kfree(rsn_ie);
+       kfree(gen_ie);
 
        return ret;
 }

diff --git a/drivers/net/wireless/mwifiex/uap_cmd.c b/drivers/net/wireless/mwifiex/uap_cmd.c
index abb1322a8ceb0a428ee09ba4ab04e2d28bade3bb..f40e93fe894aca64702219b8223c464a526c92bf 100644 (file)
--- a/drivers/net/wireless/mwifiex/uap_cmd.c
+++ b/drivers/net/wireless/mwifiex/uap_cmd.c
@@ -66,7 +66,7 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
                        }
                        if (params->crypto.wpa_versions &
                            NL80211_WPA_VERSION_2) {
-                               bss_config->protocol = PROTOCOL_WPA2;
+                               bss_config->protocol |= PROTOCOL_WPA2;
                                bss_config->key_mgmt = KEY_MGMT_EAP;
                        }
                        break;
@@ -78,7 +78,7 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
                        }
                        if (params->crypto.wpa_versions &
                            NL80211_WPA_VERSION_2) {
-                               bss_config->protocol = PROTOCOL_WPA2;
+                               bss_config->protocol |= PROTOCOL_WPA2;
                                bss_config->key_mgmt = KEY_MGMT_PSK;
                        }
                        break;
@@ -92,10 +92,19 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
                case WLAN_CIPHER_SUITE_WEP104:
                        break;
                case WLAN_CIPHER_SUITE_TKIP:
-                       bss_config->wpa_cfg.pairwise_cipher_wpa = CIPHER_TKIP;
+                       if (params->crypto.wpa_versions & NL80211_WPA_VERSION_1)
+                               bss_config->wpa_cfg.pairwise_cipher_wpa |=
+                                                               CIPHER_TKIP;
+                       if (params->crypto.wpa_versions & NL80211_WPA_VERSION_2)
+                               bss_config->wpa_cfg.pairwise_cipher_wpa2 |=
+                                                               CIPHER_TKIP;
                        break;
                case WLAN_CIPHER_SUITE_CCMP:
-                       bss_config->wpa_cfg.pairwise_cipher_wpa2 =
+                       if (params->crypto.wpa_versions & NL80211_WPA_VERSION_1)
+                               bss_config->wpa_cfg.pairwise_cipher_wpa |=
+                                                               CIPHER_AES_CCMP;
+                       if (params->crypto.wpa_versions & NL80211_WPA_VERSION_2)
+                               bss_config->wpa_cfg.pairwise_cipher_wpa2 |=
                                                                CIPHER_AES_CCMP;
                default:
                        break;