Commit 75f1df26 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: use native wireless IE codes from linux/ieee80211.h 



IE code definitions have been replaced with native ones
to avoid code duplication.

The unobvious substitutions are:
_SSN_IE_1_ -> WLAN_EID_VENDOR_SPECIFIC;
_WPA_IE_ID_ -> WLAN_EID_VENDOR_SPECIFIC;
_WPA2_IE_ID_ -> WLAN_EID_RSN.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Link: https://lore.kernel.org/r/20201011105050.5896-1-insafonov@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 42a18f09

drivers/staging/rtl8188eu/core/rtw_ap.c

+27 −27
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static void update_BCNTIM(struct adapter *padapter) 
	uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;



	/* update TIM IE */

	p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, _TIM_IE_, &tim_ielen,

	p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, WLAN_EID_TIM, &tim_ielen,

		       pnetwork_mlmeext->ie_length - _FIXED_IE_LENGTH_);

	if (p && tim_ielen > 0) {

		tim_ielen += 2;
@@ -85,7 +85,7 @@ static void update_BCNTIM(struct adapter *padapter) 
		offset += pnetwork_mlmeext->ssid.ssid_length + 2;



		/*  get supported rates len */

		p = rtw_get_ie(pie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_,

		p = rtw_get_ie(pie + _BEACON_IE_OFFSET_, WLAN_EID_SUPP_RATES,

			       &tmp_len, (pnetwork_mlmeext->ie_length -

					  _BEACON_IE_OFFSET_));

		if (p)
@@ -109,7 +109,7 @@ static void update_BCNTIM(struct adapter *padapter) 
			memcpy(pbackup_remainder_ie, premainder_ie,

			       remainder_ielen);

	}

	*dst_ie++ = _TIM_IE_;

	*dst_ie++ = WLAN_EID_TIM;



	if ((pstapriv->tim_bitmap & 0xff00) && (pstapriv->tim_bitmap & 0x00fc))

		tim_ielen = 5;
@@ -243,7 +243,7 @@ void expire_timeout_chk(struct adapter *padapter) 
					 * for this station

					 */

					pstapriv->tim_bitmap |= BIT(psta->aid);

					update_beacon(padapter, _TIM_IE_, NULL,

					update_beacon(padapter, WLAN_EID_TIM, NULL,

						      false);



					if (!pmlmeext->active_keep_alive_check)
@@ -671,7 +671,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) 
	}

	/* set channel, bwmode */

	p = rtw_get_ie(pnetwork->ies + sizeof(struct ndis_802_11_fixed_ie),

		       _HT_ADD_INFO_IE_, &ie_len,

			WLAN_EID_HT_OPERATION, &ie_len,

		       pnetwork->ie_length -

		       sizeof(struct ndis_802_11_fixed_ie));

	if (p && ie_len) {
@@ -717,7 +717,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) 
	memcpy(pnetwork_mlmeext, pnetwork, pnetwork->Length);



	if (pmlmeext->bstart_bss) {

		update_beacon(padapter, _TIM_IE_, NULL, false);

		update_beacon(padapter, WLAN_EID_TIM, NULL, false);



		/* issue beacon frame */

		if (send_beacon(padapter) == _FAIL)
@@ -788,7 +788,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	cap = get_unaligned_le16(ie);



	/* SSID */

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SSID_IE_, &ie_len,

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, WLAN_EID_SSID, &ie_len,

		       pbss_network->ie_length - _BEACON_IE_OFFSET_);

	if (p && ie_len > 0) {

		memset(&pbss_network->ssid, 0, sizeof(struct ndis_802_11_ssid));
@@ -799,7 +799,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	/* channel */

	channel = 0;

	pbss_network->Configuration.Length = 0;

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _DSSET_IE_, &ie_len,

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, WLAN_EID_DS_PARAMS, &ie_len,

		       (pbss_network->ie_length - _BEACON_IE_OFFSET_));

	if (p && ie_len > 0)

		channel = *(p + 2);
@@ -808,7 +808,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 


	memset(supportRate, 0, NDIS_802_11_LENGTH_RATES_EX);

	/*  get supported rates */

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &ie_len,

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, WLAN_EID_SUPP_RATES, &ie_len,

		       pbss_network->ie_length - _BEACON_IE_OFFSET_);

	if (p) {

		memcpy(supportRate, p + 2, ie_len);
@@ -816,7 +816,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	}



	/* get ext_supported rates */

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _EXT_SUPPORTEDRATES_IE_,

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, WLAN_EID_EXT_SUPP_RATES,

		       &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_);

	if (p) {

		memcpy(supportRate + supportRateNum, p + 2, ie_len);
@@ -828,7 +828,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	rtw_set_supported_rate(pbss_network->SupportedRates, network_type);



	/* parsing ERP_IE */

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _ERPINFO_IE_, &ie_len,

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, WLAN_EID_ERP_INFO, &ie_len,

		       pbss_network->ie_length - _BEACON_IE_OFFSET_);

	if (p && ie_len > 0)

		ERP_IE_handler(padapter, (struct ndis_802_11_var_ie *)p);
@@ -846,7 +846,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	pairwise_cipher = 0;

	psecuritypriv->wpa2_group_cipher = _NO_PRIVACY_;

	psecuritypriv->wpa2_pairwise_cipher = _NO_PRIVACY_;

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _RSN_IE_2_, &ie_len,

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, WLAN_EID_RSN, &ie_len,

		       pbss_network->ie_length - _BEACON_IE_OFFSET_);

	if (p && ie_len > 0) {

		if (rtw_parse_wpa2_ie(p, ie_len + 2, &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) {
@@ -866,7 +866,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	psecuritypriv->wpa_group_cipher = _NO_PRIVACY_;

	psecuritypriv->wpa_pairwise_cipher = _NO_PRIVACY_;

	for (p = ie + _BEACON_IE_OFFSET_;; p += (ie_len + 2)) {

		p = rtw_get_ie(p, _SSN_IE_1_, &ie_len,

		p = rtw_get_ie(p, WLAN_EID_VENDOR_SPECIFIC, &ie_len,

			       pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len + 2));

		if ((p) && (!memcmp(p + 2, OUI1, 4))) {

			if (rtw_parse_wpa_ie(p, ie_len + 2, &group_cipher,
@@ -891,7 +891,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	pmlmepriv->qospriv.qos_option = 0;

	if (pregistrypriv->wmm_enable) {

		for (p = ie + _BEACON_IE_OFFSET_;; p += (ie_len + 2)) {

			p = rtw_get_ie(p, _VENDOR_SPECIFIC_IE_, &ie_len,

			p = rtw_get_ie(p, WLAN_EID_VENDOR_SPECIFIC, &ie_len,

				       pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len + 2));

			if ((p) && !memcmp(p + 2, WMM_PARA_IE, 6)) {

				pmlmepriv->qospriv.qos_option = 1;
@@ -914,7 +914,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
		}

	}

	/* parsing HT_CAP_IE */

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _HT_CAPABILITY_IE_, &ie_len,

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, WLAN_EID_HT_CAPABILITY, &ie_len,

		       pbss_network->ie_length - _BEACON_IE_OFFSET_);

	if (p && ie_len > 0) {

		struct ieee80211_ht_cap *pht_cap = (struct ieee80211_ht_cap *)(p + 2);
@@ -938,7 +938,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	}



	/* parsing HT_INFO_IE */

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _HT_ADD_INFO_IE_, &ie_len,

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, WLAN_EID_HT_OPERATION, &ie_len,

		       pbss_network->ie_length - _BEACON_IE_OFFSET_);

	if (p && ie_len > 0)

		pHT_info_ie = p;
@@ -1128,7 +1128,7 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter) 
		return;



	/* parsing ERP_IE */

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _ERPINFO_IE_, &len,

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, WLAN_EID_ERP_INFO, &len,

		       (pnetwork->ie_length - _BEACON_IE_OFFSET_));

	if (p && len > 0) {

		struct ndis_802_11_var_ie *pIE = (struct ndis_802_11_var_ie *)p;
@@ -1227,13 +1227,13 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx) 
	spin_lock_bh(&pmlmepriv->bcn_update_lock);



	switch (ie_id) {

	case _TIM_IE_:

	case WLAN_EID_TIM:

		update_BCNTIM(padapter);

		break;

	case _ERPINFO_IE_:

	case WLAN_EID_ERP_INFO:

		update_bcn_erpinfo_ie(padapter);

		break;

	case _VENDOR_SPECIFIC_IE_:

	case WLAN_EID_VENDOR_SPECIFIC:

		update_bcn_vendor_spec_ie(padapter, oui);

		break;

	default:
@@ -1394,7 +1394,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) 


			if (pmlmepriv->num_sta_non_erp == 1) {

				beacon_updated = true;

				update_beacon(padapter, _ERPINFO_IE_, NULL, true);

				update_beacon(padapter, WLAN_EID_ERP_INFO, NULL, true);

			}

		}

	} else {
@@ -1405,7 +1405,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) 


			if (pmlmepriv->num_sta_non_erp == 0) {

				beacon_updated = true;

				update_beacon(padapter, _ERPINFO_IE_, NULL, true);

				update_beacon(padapter, WLAN_EID_ERP_INFO, NULL, true);

			}

		}

	}
@@ -1479,8 +1479,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) 
	}



	if (rtw_ht_operation_update(padapter) > 0) {

		update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, false);

		update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true);

		update_beacon(padapter, WLAN_EID_HT_CAPABILITY, NULL, false);

		update_beacon(padapter, WLAN_EID_HT_OPERATION, NULL, true);

	}



	/* update associated stations cap. */
@@ -1513,7 +1513,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) 
		pmlmepriv->num_sta_non_erp--;

		if (pmlmepriv->num_sta_non_erp == 0) {

			beacon_updated = true;

			update_beacon(padapter, _ERPINFO_IE_, NULL, true);

			update_beacon(padapter, WLAN_EID_ERP_INFO, NULL, true);

		}

	}
@@ -1543,8 +1543,8 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) 
	}



	if (rtw_ht_operation_update(padapter) > 0) {

		update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, false);

		update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true);

		update_beacon(padapter, WLAN_EID_HT_CAPABILITY, NULL, false);

		update_beacon(padapter, WLAN_EID_HT_OPERATION, NULL, true);

	}



	/* update associated stations cap. */

drivers/staging/rtl8188eu/core/rtw_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -1057,7 +1057,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter) 
			pstapriv->tim_bitmap &= ~BIT(0);

			pstapriv->sta_dz_bitmap &= ~BIT(0);



			update_beacon(padapter, _TIM_IE_, NULL, false);

			update_beacon(padapter, WLAN_EID_TIM, NULL, false);

		} else { /* re check again */

			rtw_chk_hi_queue_cmd(padapter);

		}

drivers/staging/rtl8188eu/core/rtw_ieee80211.c

+18 −18
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv) 
	ie += 2;



	/* SSID */

	ie = rtw_set_ie(ie, _SSID_IE_, pdev_network->ssid.ssid_length, pdev_network->ssid.ssid, &sz);

	ie = rtw_set_ie(ie, WLAN_EID_SSID, pdev_network->ssid.ssid_length, pdev_network->ssid.ssid, &sz);



	/* supported rates */

	if (pregistrypriv->wireless_mode == WIRELESS_11ABGN)
@@ -248,21 +248,21 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv) 
	rateLen = rtw_get_rateset_len(pdev_network->SupportedRates);



	if (rateLen > 8) {

		ie = rtw_set_ie(ie, _SUPPORTEDRATES_IE_, 8, pdev_network->SupportedRates, &sz);

		/* ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz); */

		ie = rtw_set_ie(ie, WLAN_EID_SUPP_RATES, 8, pdev_network->SupportedRates, &sz);

		/* ie = rtw_set_ie(ie, WLAN_EID_EXT_SUPP_RATES, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz); */

	} else {

		ie = rtw_set_ie(ie, _SUPPORTEDRATES_IE_, rateLen, pdev_network->SupportedRates, &sz);

		ie = rtw_set_ie(ie, WLAN_EID_SUPP_RATES, rateLen, pdev_network->SupportedRates, &sz);

	}



	/* DS parameter set */

	ie = rtw_set_ie(ie, _DSSET_IE_, 1, (u8 *)&pdev_network->Configuration.DSConfig, &sz);

	ie = rtw_set_ie(ie, WLAN_EID_DS_PARAMS, 1, (u8 *)&pdev_network->Configuration.DSConfig, &sz);



	/* IBSS Parameter Set */



	ie = rtw_set_ie(ie, _IBSS_PARA_IE_, 2, (u8 *)&pdev_network->Configuration.ATIMWindow, &sz);

	ie = rtw_set_ie(ie, WLAN_EID_IBSS_PARAMS, 2, (u8 *)&pdev_network->Configuration.ATIMWindow, &sz);



	if (rateLen > 8)

		ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz);

		ie = rtw_set_ie(ie, WLAN_EID_EXT_SUPP_RATES, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz);



	return sz;

}
@@ -277,7 +277,7 @@ unsigned char *rtw_get_wpa_ie(unsigned char *pie, uint *wpa_ie_len, int limit) 
	int limit_new = limit;



	while (1) {

		pbuf = rtw_get_ie(pbuf, _WPA_IE_ID_, &len, limit_new);

		pbuf = rtw_get_ie(pbuf, WLAN_EID_VENDOR_SPECIFIC, &len, limit_new);



		if (pbuf) {

			/* check if oui matches... */
@@ -308,7 +308,7 @@ unsigned char *rtw_get_wpa_ie(unsigned char *pie, uint *wpa_ie_len, int limit) 


unsigned char *rtw_get_wpa2_ie(unsigned char *pie, uint *rsn_ie_len, int limit)

{

	return rtw_get_ie(pie, _WPA2_IE_ID_, rsn_ie_len, limit);

	return rtw_get_ie(pie, WLAN_EID_RSN, rsn_ie_len, limit);

}



int rtw_get_wpa_cipher_suite(u8 *s)
@@ -355,7 +355,7 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis 
		return _FAIL;

	}



	if ((*wpa_ie != _WPA_IE_ID_) || (*(wpa_ie + 1) != (u8)(wpa_ie_len - 2)) ||

	if ((*wpa_ie != WLAN_EID_VENDOR_SPECIFIC) || (*(wpa_ie + 1) != (u8)(wpa_ie_len - 2)) ||

	    (memcmp(wpa_ie + 2, RTW_WPA_OUI_TYPE, WPA_SELECTOR_LEN)))

		return _FAIL;
@@ -422,7 +422,7 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi 
		return _FAIL;

	}



	if ((*rsn_ie != _WPA2_IE_ID_) || (*(rsn_ie + 1) != (u8)(rsn_ie_len - 2)))

	if ((*rsn_ie != WLAN_EID_RSN) || (*(rsn_ie + 1) != (u8)(rsn_ie_len - 2)))

		return _FAIL;



	pos = rsn_ie;
@@ -493,7 +493,7 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie 
	while (cnt < in_len) {

		authmode = in_ie[cnt];



		if ((authmode == _WPA_IE_ID_) && (!memcmp(&in_ie[cnt + 2], &wpa_oui[0], 4))) {

		if ((authmode == WLAN_EID_VENDOR_SPECIFIC) && (!memcmp(&in_ie[cnt + 2], &wpa_oui[0], 4))) {

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

				 ("\n rtw_get_wpa_ie: sec_idx =%d in_ie[cnt+1]+2 =%d\n",

				 sec_idx, in_ie[cnt + 1] + 2));
@@ -512,7 +512,7 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie 
			*wpa_len = in_ie[cnt + 1] + 2;

			cnt += in_ie[cnt + 1] + 2;  /* get next */

		} else {

			if (authmode == _WPA2_IE_ID_) {

			if (authmode == WLAN_EID_RSN) {

				RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

					 ("\n get_rsn_ie: sec_idx =%d in_ie[cnt+1]+2 =%d\n",

					 sec_idx, in_ie[cnt + 1] + 2));
@@ -547,7 +547,7 @@ u8 rtw_is_wps_ie(u8 *ie_ptr, uint *wps_ielen) 


	eid = ie_ptr[0];



	if ((eid == _WPA_IE_ID_) && (!memcmp(&ie_ptr[2], wps_oui, 4))) {

	if ((eid == WLAN_EID_VENDOR_SPECIFIC) && (!memcmp(&ie_ptr[2], wps_oui, 4))) {

		*wps_ielen = ie_ptr[1] + 2;

		match = true;

	}
@@ -580,7 +580,7 @@ u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen) 
	while (cnt < in_len) {

		eid = in_ie[cnt];



		if ((eid == _WPA_IE_ID_) && (!memcmp(&in_ie[cnt + 2], wps_oui, 4))) {

		if ((eid == WLAN_EID_VENDOR_SPECIFIC) && (!memcmp(&in_ie[cnt + 2], wps_oui, 4))) {

			wpsie_ptr = &in_ie[cnt];



			if (wps_ie)
@@ -617,7 +617,7 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8 *buf_att 
	if (len_attr)

		*len_attr = 0;



	if ((wps_ie[0] != _VENDOR_SPECIFIC_IE_) ||

	if ((wps_ie[0] != WLAN_EID_VENDOR_SPECIFIC) ||

	    (memcmp(wps_ie + 2, wps_oui, 4)))

		return attr_ptr;
@@ -995,7 +995,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) 


	/* get bwmode and ch_offset */

	/* parsing HT_CAP_IE */

	p = rtw_get_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_);

	p = rtw_get_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, WLAN_EID_HT_CAPABILITY, &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_);

	if (p && len > 0) {

		struct ieee80211_ht_cap *ht_cap =

			(struct ieee80211_ht_cap *)(p + 2);
@@ -1005,7 +1005,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) 
		pnetwork->BcnInfo.ht_cap_info = 0;

	}

	/* parsing HT_INFO_IE */

	p = rtw_get_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, _HT_ADD_INFO_IE_, &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_);

	p = rtw_get_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, WLAN_EID_HT_OPERATION, &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_);

	if (p && len > 0) {

		pht_info = (struct HT_info_element *)(p + 2);

		pnetwork->BcnInfo.ht_info_infos_0 = pht_info->infos[0];

drivers/staging/rtl8188eu/core/rtw_ioctl_set.c

+1 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) 
		return 0;



	if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N | WIRELESS_11_5N)) {

		p = rtw_get_ie(&pcur_bss->ies[12], _HT_CAPABILITY_IE_,

		p = rtw_get_ie(&pcur_bss->ies[12], WLAN_EID_HT_CAPABILITY,

			       &ht_ielen, pcur_bss->ie_length - 12);

		if (p && ht_ielen > 0) {

			/* cur_bwmod is updated by beacon, pmlmeinfo is updated by association response */

drivers/staging/rtl8188eu/core/rtw_mlme.c

+9 −9
Original line number Diff line number Diff line
@@ -1728,10 +1728,10 @@ int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_ 
	ielength = 12;

	if ((ndisauthmode == Ndis802_11AuthModeWPA) ||

	    (ndisauthmode == Ndis802_11AuthModeWPAPSK))

		authmode = _WPA_IE_ID_;

		authmode = WLAN_EID_VENDOR_SPECIFIC;

	else if ((ndisauthmode == Ndis802_11AuthModeWPA2) ||

		 (ndisauthmode == Ndis802_11AuthModeWPA2PSK))

		authmode = _WPA2_IE_ID_;

		authmode = WLAN_EID_RSN;

	else

		authmode = 0x0;
@@ -1739,7 +1739,7 @@ int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_ 
		memcpy(out_ie + ielength, psecuritypriv->wps_ie, psecuritypriv->wps_ie_len);



		ielength += psecuritypriv->wps_ie_len;

	} else if ((authmode == _WPA_IE_ID_) || (authmode == _WPA2_IE_ID_)) {

	} else if ((authmode == WLAN_EID_VENDOR_SPECIFIC) || (authmode == WLAN_EID_RSN)) {

		/* copy RSN or SSN */

		memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], psecuritypriv->supplicant_ie[1] + 2);

		ielength += psecuritypriv->supplicant_ie[1] + 2;
@@ -1747,7 +1747,7 @@ int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_ 
	}



	iEntry = SecIsInPMKIDList(adapter, pmlmepriv->assoc_bssid);

	if (iEntry >= 0 && authmode == _WPA2_IE_ID_)

	if (iEntry >= 0 && authmode == WLAN_EID_RSN)

		ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength);



	return ielength;
@@ -1867,14 +1867,14 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ 


	phtpriv->ht_option = false;



	p = rtw_get_ie(in_ie + 12, _HT_CAPABILITY_IE_, &ielen, in_len - 12);

	p = rtw_get_ie(in_ie + 12, WLAN_EID_HT_CAPABILITY, &ielen, in_len - 12);



	if (p && ielen > 0) {

		struct ieee80211_ht_cap ht_cap;



		if (pqospriv->qos_option == 0) {

			out_len = *pout_len;

			rtw_set_ie(out_ie + out_len, _VENDOR_SPECIFIC_IE_,

			rtw_set_ie(out_ie + out_len, WLAN_EID_VENDOR_SPECIFIC,

				   _WMM_IE_Length_, WMM_IE, pout_len);



			pqospriv->qos_option = 1;
@@ -1906,16 +1906,16 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ 
		else

			ht_cap.ampdu_params_info |= IEEE80211_HT_AMPDU_PARM_DENSITY & 0x00;



		rtw_set_ie(out_ie + out_len, _HT_CAPABILITY_IE_,

		rtw_set_ie(out_ie + out_len, WLAN_EID_HT_CAPABILITY,

			   sizeof(struct ieee80211_ht_cap),

			   (unsigned char *)&ht_cap, pout_len);



		phtpriv->ht_option = true;



		p = rtw_get_ie(in_ie + 12, _HT_ADD_INFO_IE_, &ielen, in_len - 12);

		p = rtw_get_ie(in_ie + 12, WLAN_EID_HT_OPERATION, &ielen, in_len - 12);

		if (p && (ielen == sizeof(struct ieee80211_ht_addt_info))) {

			out_len = *pout_len;

			rtw_set_ie(out_ie + out_len, _HT_ADD_INFO_IE_, ielen, p + 2, pout_len);

			rtw_set_ie(out_ie + out_len, WLAN_EID_HT_OPERATION, ielen, p + 2, pout_len);

		}

	}

	return phtpriv->ht_option;