Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fd66be4 authored by Avinash Patil's avatar Avinash Patil Committed by John W. Linville
Browse files

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: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarKiran Divekar <dkiran@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d217249d

drivers/net/wireless/mwifiex/ie.c

+36 −19
Original line number Diff line number Diff line
@@ -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)

		gen_ie = kzalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);

		if (!gen_ie)

			return -ENOMEM;



			rsn_ie->ie_index = cpu_to_le16(rsn_idx);

		gen_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);

		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 (mwifiex_update_uap_custom_ie(priv, rsn_ie, &rsn_idx,

		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 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv, 
	kfree(beacon_ie);

	kfree(pr_ie);

	kfree(ar_ie);

	kfree(rsn_ie);

	kfree(gen_ie);



	return ret;

}

drivers/net/wireless/mwifiex/uap_cmd.c

+13 −4
Original line number Diff line number Diff line
@@ -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;