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

mwifiex: separate IE parsing for Head/Tail IEs and beacon_ies etc 



While Head/Tail IEs may contain RSN/WPA IEs which needs to be set
for all mgmt subtypes, beacon_ies, probe_resp_ies, assoc_resp_ies
are for specific mgmt subtypes. Move them to separate function.

Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent adb6ed0c

drivers/net/wireless/mwifiex/ie.c

+65 −54
Original line number Diff line number Diff line
@@ -217,62 +217,17 @@ mwifiex_update_uap_custom_ie(struct mwifiex_private *priv, 
	return ret;

}



/* This function parses different IEs- Tail IEs, beacon IEs, probe response IEs,

 * association response IEs from cfg80211_ap_settings function and sets these IE

 * to FW.

/* This function parses beacon IEs, probe response IEs, association response IEs

 * from cfg80211_ap_settings->beacon and sets these IE to FW.

 */

int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,

static int mwifiex_set_mgmt_beacon_data_ies(struct mwifiex_private *priv,

					    struct cfg80211_beacon_data *data)

{

	struct mwifiex_ie *beacon_ie = NULL, *pr_ie = NULL;

	struct mwifiex_ie *ar_ie = NULL, *gen_ie = NULL;

	struct ieee_types_header *rsn_ie = NULL, *wpa_ie = NULL;

	struct mwifiex_ie *beacon_ie = NULL, *pr_ie = NULL, *ar_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, ie_len = 0;

	const u8 *vendor_ie;

	u16 ar_idx = MWIFIEX_AUTO_IDX_MASK;

	int ret = 0;



	if (data->tail && data->tail_len) {

		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,

						  data->tail, data->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,

						    data->tail, data->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;

				goto done;

			}



			priv->rsn_idx = rsn_idx;

		}

	}



	if (data->beacon_ies && data->beacon_ies_len) {

		beacon_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);

		if (!beacon_ie) {
@@ -309,8 +264,8 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv, 
		}



		ar_ie->ie_index = cpu_to_le16(ar_idx);

		mask = MGMT_MASK_ASSOC_RESP | MGMT_MASK_REASSOC_RESP;

		ar_ie->mgmt_subtype_mask = cpu_to_le16(mask);

		ar_ie->mgmt_subtype_mask = cpu_to_le16(MGMT_MASK_ASSOC_RESP |

						       MGMT_MASK_REASSOC_RESP);

		ar_ie->ie_length = cpu_to_le16(data->assocresp_ies_len);

		memcpy(ar_ie->ie_buffer, data->assocresp_ies,

		       data->assocresp_ies_len);
@@ -332,11 +287,67 @@ done: 
	kfree(beacon_ie);

	kfree(pr_ie);

	kfree(ar_ie);

	kfree(gen_ie);



	return ret;

}



/* This function parses different IEs-tail IEs, beacon IEs, probe response IEs,

 * association response IEs from cfg80211_ap_settings function and sets these IE

 * to FW.

 */

int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,

			 struct cfg80211_beacon_data *info)

{

	struct mwifiex_ie *gen_ie;

	struct ieee_types_header *rsn_ie, *wpa_ie = NULL;

	u16 rsn_idx = MWIFIEX_AUTO_IDX_MASK, ie_len = 0;

	const u8 *vendor_ie;



	if (info->tail && info->tail_len) {

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

		if (!gen_ie)

			return -ENOMEM;

		gen_ie->ie_index = cpu_to_le16(rsn_idx);

		gen_ie->mgmt_subtype_mask = cpu_to_le16(MGMT_MASK_BEACON |

							MGMT_MASK_PROBE_RESP |

							MGMT_MASK_ASSOC_RESP);



		rsn_ie = (void *)cfg80211_find_ie(WLAN_EID_RSN,

						  info->tail, info->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,

						    info->tail,

						    info->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)) {

				kfree(gen_ie);

				return -1;

			}

			priv->rsn_idx = rsn_idx;

		}



		kfree(gen_ie);

	}



	return mwifiex_set_mgmt_beacon_data_ies(priv, info);

}



/* This function removes management IE set */

int mwifiex_del_mgmt_ies(struct mwifiex_private *priv)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE