Commit 341f27d0 authored by Janani Sankara Babu's avatar Janani Sankara Babu Committed by Greg Kroah-Hartman
Browse files

Staging:rtl888eu:include Fix CamelCase issue 



This patch is created to solve the CamelCase issue. The members 'IEs'
and 'IELength' of struct wlan_bssid_ex are being modified to 'ie' and
'ie_length' to solve the issue. And the places where these variables
are referenced inside rtl8188eu driver are also changed.

Signed-off-by: default avatarJanani Sankara Babu <jananis37@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 17f74bd3

drivers/staging/rtl8188eu/core/rtw_ap.c

+36 −36
Original line number Diff line number Diff line
@@ -69,19 +69,19 @@ static void update_BCNTIM(struct adapter *padapter) 
	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;

	struct wlan_bssid_ex *pnetwork_mlmeext = &pmlmeinfo->network;

	unsigned char *pie = pnetwork_mlmeext->IEs;

	unsigned char *pie = pnetwork_mlmeext->ies;

	u8 *p, *dst_ie, *premainder_ie = NULL;

	u8 *pbackup_remainder_ie = NULL;

	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,

			pnetwork_mlmeext->IELength - _FIXED_IE_LENGTH_);

			pnetwork_mlmeext->ie_length - _FIXED_IE_LENGTH_);

	if (p && tim_ielen > 0) {

		tim_ielen += 2;

		premainder_ie = p + tim_ielen;

		tim_ie_offset = (int)(p - pie);

		remainder_ielen = pnetwork_mlmeext->IELength -

		remainder_ielen = pnetwork_mlmeext->ie_length -

					tim_ie_offset - tim_ielen;

		/* append TIM IE from dst_ie offset */

		dst_ie = p;
@@ -94,7 +94,7 @@ static void update_BCNTIM(struct adapter *padapter) 


		/*  get supported rates len */

		p = rtw_get_ie(pie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_,

			       &tmp_len, (pnetwork_mlmeext->IELength -

			       &tmp_len, (pnetwork_mlmeext->ie_length -

					  _BEACON_IE_OFFSET_));

		if (p)

			offset += tmp_len+2;
@@ -104,7 +104,7 @@ static void update_BCNTIM(struct adapter *padapter) 


		premainder_ie = pie + offset;



		remainder_ielen = pnetwork_mlmeext->IELength -

		remainder_ielen = pnetwork_mlmeext->ie_length -

					offset - tim_ielen;



		/* append TIM IE from offset */
@@ -148,7 +148,7 @@ static void update_BCNTIM(struct adapter *padapter) 
		kfree(pbackup_remainder_ie);

	}

	offset =  (uint)(dst_ie - pie);

	pnetwork_mlmeext->IELength = offset + remainder_ielen;

	pnetwork_mlmeext->ie_length = offset + remainder_ielen;



	set_tx_beacon_cmd(padapter);

}
@@ -158,13 +158,13 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, 
{

	struct ndis_802_11_var_ie *pIE;

	u8 bmatch = false;

	u8 *pie = pnetwork->IEs;

	u8 *pie = pnetwork->ies;

	u8 *p = NULL, *dst_ie = NULL, *premainder_ie = NULL;

	u8 *pbackup_remainder_ie = NULL;

	u32 i, offset, ielen = 0, ie_offset, remainder_ielen = 0;



	for (i = sizeof(struct ndis_802_11_fixed_ie); i < pnetwork->IELength;) {

		pIE = (struct ndis_802_11_var_ie *)(pnetwork->IEs + i);

	for (i = sizeof(struct ndis_802_11_fixed_ie); i < pnetwork->ie_length;) {

		pIE = (struct ndis_802_11_var_ie *)(pnetwork->ies + i);



		if (pIE->ElementID > index) {

			break;
@@ -187,7 +187,7 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, 


		ie_offset = (int)(p - pie);



		remainder_ielen = pnetwork->IELength - ie_offset - ielen;

		remainder_ielen = pnetwork->ie_length - ie_offset - ielen;



		if (bmatch)

			dst_ie = p;
@@ -216,7 +216,7 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, 
	}



	offset =  (uint)(dst_ie - pie);

	pnetwork->IELength = offset + remainder_ielen;

	pnetwork->ie_length = offset + remainder_ielen;

}



void rtw_remove_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork,
@@ -225,10 +225,10 @@ void rtw_remove_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, 
	u8 *p, *dst_ie = NULL, *premainder_ie = NULL;

	u8 *pbackup_remainder_ie = NULL;

	uint offset, ielen, ie_offset, remainder_ielen = 0;

	u8	*pie = pnetwork->IEs;

	u8	*pie = pnetwork->ies;



	p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, index, &ielen,

		       pnetwork->IELength - _FIXED_IE_LENGTH_);

		       pnetwork->ie_length - _FIXED_IE_LENGTH_);

	if (p && ielen > 0) {

		ielen += 2;
@@ -236,7 +236,7 @@ void rtw_remove_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, 


		ie_offset = (int)(p - pie);



		remainder_ielen = pnetwork->IELength - ie_offset - ielen;

		remainder_ielen = pnetwork->ie_length - ie_offset - ielen;



		dst_ie = p;

	}
@@ -256,7 +256,7 @@ void rtw_remove_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, 
	}



	offset =  (uint)(dst_ie - pie);

	pnetwork->IELength = offset + remainder_ielen;

	pnetwork->ie_length = offset + remainder_ielen;

}



static u8 chk_sta_is_alive(struct sta_info *psta)
@@ -740,7 +740,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) 
	 * beacon twice when stating hostapd, and at first time the

	 * security ie (RSN/WPA IE) will not include in beacon.

	 */

	if (!rtw_get_wps_ie(pnetwork->IEs + _FIXED_IE_LENGTH_, pnetwork->IELength - _FIXED_IE_LENGTH_, NULL, NULL))

	if (!rtw_get_wps_ie(pnetwork->ies + _FIXED_IE_LENGTH_, pnetwork->ie_length - _FIXED_IE_LENGTH_, NULL, NULL))

		pmlmeext->bstart_bss = true;



	/* todo: update wmm, ht cap */
@@ -794,7 +794,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) 
		Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true);

	}

	/* set channel, bwmode */

	p = rtw_get_ie((pnetwork->IEs + sizeof(struct ndis_802_11_fixed_ie)), _HT_ADD_INFO_IE_, &ie_len, (pnetwork->IELength - sizeof(struct ndis_802_11_fixed_ie)));

	p = rtw_get_ie((pnetwork->ies + sizeof(struct ndis_802_11_fixed_ie)), _HT_ADD_INFO_IE_, &ie_len, (pnetwork->ie_length - sizeof(struct ndis_802_11_fixed_ie)));

	if (p && ie_len) {

		pht_info = (struct HT_info_element *)(p + 2);
@@ -866,7 +866,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	struct security_priv *psecuritypriv = &padapter->securitypriv;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct wlan_bssid_ex *pbss_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;

	u8 *ie = pbss_network->IEs;

	u8 *ie = pbss_network->ies;



	/* SSID */

	/* Supported rates */
@@ -888,11 +888,11 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	if (len < 0 || len > MAX_IE_SZ)

		return _FAIL;



	pbss_network->IELength = len;

	pbss_network->ie_length = len;



	memset(ie, 0, MAX_IE_SZ);



	memcpy(ie, pbuf, pbss_network->IELength);

	memcpy(ie, pbuf, pbss_network->ie_length);





	if (pbss_network->InfrastructureMode != Ndis802_11APMode)
@@ -910,7 +910,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, (pbss_network->IELength - _BEACON_IE_OFFSET_));

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SSID_IE_, &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));

		memcpy(pbss_network->Ssid.Ssid, (p + 2), ie_len);
@@ -920,7 +920,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, (pbss_network->IELength - _BEACON_IE_OFFSET_));

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _DSSET_IE_, &ie_len, (pbss_network->ie_length - _BEACON_IE_OFFSET_));

	if (p && ie_len > 0)

		channel = *(p + 2);
@@ -928,14 +928,14 @@ 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, (pbss_network->IELength - _BEACON_IE_OFFSET_));

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &ie_len, (pbss_network->ie_length - _BEACON_IE_OFFSET_));

	if (p) {

		memcpy(supportRate, p + 2, ie_len);

		supportRateNum = ie_len;

	}



	/* get ext_supported rates */

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _EXT_SUPPORTEDRATES_IE_, &ie_len, pbss_network->IELength - _BEACON_IE_OFFSET_);

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _EXT_SUPPORTEDRATES_IE_, &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_);

	if (p) {

		memcpy(supportRate + supportRateNum, p + 2, ie_len);

		supportRateNum += ie_len;
@@ -946,7 +946,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, (pbss_network->IELength - _BEACON_IE_OFFSET_));

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _ERPINFO_IE_, &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);
@@ -963,7 +963,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, (pbss_network->IELength - _BEACON_IE_OFFSET_));

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _RSN_IE_2_, &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) {

			psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
@@ -983,7 +983,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	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,

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

			       (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,

					     &pairwise_cipher, NULL) == _SUCCESS) {
@@ -1008,7 +1008,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	if (pregistrypriv->wmm_enable) {

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

			p = rtw_get_ie(p, _VENDOR_SPECIFIC_IE_, &ie_len,

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

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

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

				pmlmepriv->qospriv.qos_option = 1;
@@ -1031,7 +1031,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,

		       (pbss_network->IELength - _BEACON_IE_OFFSET_));

		       (pbss_network->ie_length - _BEACON_IE_OFFSET_));

	if (p && ie_len > 0) {

		struct ieee80211_ht_cap *pht_cap = (struct ieee80211_ht_cap *)(p + 2);
@@ -1055,7 +1055,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,

		       (pbss_network->IELength - _BEACON_IE_OFFSET_));

		       (pbss_network->ie_length - _BEACON_IE_OFFSET_));

	if (p && ie_len > 0)

		pHT_info_ie = p;

	switch (network_type) {
@@ -1235,7 +1235,7 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter) 
	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info	*pmlmeinfo = &pmlmeext->mlmext_info;

	struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;

	unsigned char *p, *ie = pnetwork->IEs;

	unsigned char *p, *ie = pnetwork->ies;

	u32 len = 0;



	DBG_88E("%s, ERP_enable =%d\n", __func__, pmlmeinfo->ERP_enable);
@@ -1245,7 +1245,7 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter) 


	/* parsing ERP_IE */

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

		       (pnetwork->IELength - _BEACON_IE_OFFSET_));

		       (pnetwork->ie_length - _BEACON_IE_OFFSET_));

	if (p && len > 0) {

		struct ndis_802_11_var_ie *pIE = (struct ndis_802_11_var_ie *)p;
@@ -1272,8 +1272,8 @@ static void update_bcn_wps_ie(struct adapter *padapter) 
	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info	*pmlmeinfo = &pmlmeext->mlmext_info;

	struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;

	unsigned char *ie = pnetwork->IEs;

	u32 ielen = pnetwork->IELength;

	unsigned char *ie = pnetwork->ies;

	u32 ielen = pnetwork->ie_length;



	DBG_88E("%s\n", __func__);
@@ -1306,8 +1306,8 @@ static void update_bcn_wps_ie(struct adapter *padapter) 
		if (pbackup_remainder_ie)

			memcpy(pwps_ie, pbackup_remainder_ie, remainder_ielen);



		/* update IELength */

		pnetwork->IELength = wps_offset + (wps_ielen+2) + remainder_ielen;

		/* update ie_length */

		pnetwork->ie_length = wps_offset + (wps_ielen+2) + remainder_ielen;

	}



	kfree(pbackup_remainder_ie);

drivers/staging/rtl8188eu/core/rtw_cmd.c

+13 −13
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) 
		res = _FAIL;

		goto exit;

	}

	/* for IEs is fix buf size */

	/* for ies is fix buf size */

	t_len = sizeof(struct wlan_bssid_ex);



	/* for hidden ap to set fw_state here */
@@ -415,14 +415,14 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) 


	memcpy(psecnetwork, &pnetwork->network, get_wlan_bssid_ex_sz(&pnetwork->network));



	psecuritypriv->authenticator_ie[0] = (unsigned char)psecnetwork->IELength;

	psecuritypriv->authenticator_ie[0] = (unsigned char)psecnetwork->ie_length;



	if ((psecnetwork->IELength-12) < (256-1))

		memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], psecnetwork->IELength-12);

	if ((psecnetwork->ie_length-12) < (256-1))

		memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->ies[12], psecnetwork->ie_length-12);

	else

		memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], (256-1));

		memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->ies[12], (256-1));



	psecnetwork->IELength = 0;

	psecnetwork->ie_length = 0;

	/*  Added by Albert 2009/02/18 */

	/*  If the driver wants to use the bssid to create the connection. */

	/*  If not,  we have to copy the connecting AP's MAC address to it so that */
@@ -431,17 +431,17 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) 
	if (!pmlmepriv->assoc_by_bssid)

		memcpy(&pmlmepriv->assoc_bssid[0], &pnetwork->network.MacAddress[0], ETH_ALEN);



	psecnetwork->IELength = rtw_restruct_sec_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0], pnetwork->network.IELength);

	psecnetwork->ie_length = rtw_restruct_sec_ie(padapter, &pnetwork->network.ies[0], &psecnetwork->ies[0], pnetwork->network.ie_length);



	pqospriv->qos_option = 0;



	if (pregistrypriv->wmm_enable) {

		u32 tmp_len;



		tmp_len = rtw_restruct_wmm_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0], pnetwork->network.IELength, psecnetwork->IELength);

		tmp_len = rtw_restruct_wmm_ie(padapter, &pnetwork->network.ies[0], &psecnetwork->ies[0], pnetwork->network.ie_length, psecnetwork->ie_length);



		if (psecnetwork->IELength != tmp_len) {

			psecnetwork->IELength = tmp_len;

		if (psecnetwork->ie_length != tmp_len) {

			psecnetwork->ie_length = tmp_len;

			pqospriv->qos_option = 1; /* There is WMM IE in this corresp. beacon */

		} else {

			pqospriv->qos_option = 0;/* There is no WMM IE in this corresp. beacon */
@@ -460,12 +460,12 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) 
		    (padapter->securitypriv.dot11PrivacyAlgrthm != _WEP104_) &&

		    (padapter->securitypriv.dot11PrivacyAlgrthm != _TKIP_)) {

			/* rtw_restructure_ht_ie */

			rtw_restructure_ht_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0],

									pnetwork->network.IELength, &psecnetwork->IELength);

			rtw_restructure_ht_ie(padapter, &pnetwork->network.ies[0], &psecnetwork->ies[0],

									pnetwork->network.ie_length, &psecnetwork->ie_length);

		}

	}



	pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pnetwork->network.IEs, pnetwork->network.IELength);

	pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pnetwork->network.ies, pnetwork->network.ie_length);



	if (pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_TENDA)

		padapter->pwrctrlpriv.smart_ps = 0;

drivers/staging/rtl8188eu/core/rtw_ieee80211.c

+10 −10
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv) 
	int	rateLen;

	uint    sz = 0;

	struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;

	u8 *ie = pdev_network->IEs;

	u8 *ie = pdev_network->ies;





	/* timestamp will be inserted by hardware */
@@ -590,8 +590,8 @@ u8 rtw_is_wps_ie(u8 *ie_ptr, uint *wps_ielen) 
}



/**

 * rtw_get_wps_ie - Search WPS IE from a series of IEs

 * @in_ie: Address of IEs to search

 * rtw_get_wps_ie - Search WPS IE from a series of ies

 * @in_ie: Address of ies to search

 * @in_len: Length limit from in_ie

 * @wps_ie: If not NULL and WPS IE is found, WPS IE will be copied to the buf starting from wps_ie

 * @wps_ielen: If not NULL and WPS IE is found, will set to the length of the entire WPS IE
@@ -798,7 +798,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen, 


/**

 * ieee802_11_parse_elems - Parse information elements in management frames

 * @start: Pointer to the start of IEs

 * @start: Pointer to the start of ies

 * @len: Length of IE buffer in octets

 * @elems: Data structure for parsed elements

 * @show_errors: Whether to show parsing errors in debug log
@@ -962,7 +962,7 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork) 
	int group_cipher = 0, pairwise_cipher = 0, is8021x = 0;

	int ret = _FAIL;



	pbuf = rtw_get_wpa_ie(&pnetwork->network.IEs[12], &wpa_ielen, pnetwork->network.IELength - 12);

	pbuf = rtw_get_wpa_ie(&pnetwork->network.ies[12], &wpa_ielen, pnetwork->network.ie_length - 12);



	if (pbuf && (wpa_ielen > 0)) {

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s: wpa_ielen: %d", __func__, wpa_ielen));
@@ -975,7 +975,7 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork) 
			ret = _SUCCESS;

		}

	} else {

		pbuf = rtw_get_wpa2_ie(&pnetwork->network.IEs[12], &wpa_ielen, pnetwork->network.IELength - 12);

		pbuf = rtw_get_wpa2_ie(&pnetwork->network.ies[12], &wpa_ielen, pnetwork->network.ie_length - 12);



		if (pbuf && (wpa_ielen > 0)) {

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("get RSN IE\n"));
@@ -1005,7 +1005,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) 
	uint len;

	unsigned char		*p;



	memcpy(&le_tmp, rtw_get_capability_from_ie(pnetwork->network.IEs), 2);

	memcpy(&le_tmp, rtw_get_capability_from_ie(pnetwork->network.ies), 2);

	cap = le16_to_cpu(le_tmp);

	if (cap & WLAN_CAPABILITY_PRIVACY) {

		bencrypt = 1;
@@ -1013,7 +1013,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) 
	} else {

		pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_OPENSYS;

	}

	rtw_get_sec_ie(pnetwork->network.IEs, pnetwork->network.IELength, NULL, &rsn_len, NULL, &wpa_len);

	rtw_get_sec_ie(pnetwork->network.ies, pnetwork->network.ie_length, NULL, &rsn_len, NULL, &wpa_len);

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s: ssid =%s\n", __func__, pnetwork->network.Ssid.Ssid));

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s: wpa_len =%d rsn_len =%d\n", __func__, wpa_len, rsn_len));

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s: ssid =%s\n", __func__, pnetwork->network.Ssid.Ssid));
@@ -1035,7 +1035,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.IELength - _FIXED_IE_LENGTH_);

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

	if (p && len > 0) {

		struct ieee80211_ht_cap *ht_cap =

			(struct ieee80211_ht_cap *)(p + 2);
@@ -1045,7 +1045,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.IELength - _FIXED_IE_LENGTH_);

	p = rtw_get_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, _HT_ADD_INFO_IE_, &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
@@ -577,7 +577,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_, &ht_ielen, pcur_bss->IELength-12);

		p = rtw_get_ie(&pcur_bss->ies[12], _HT_CAPABILITY_IE_, &ht_ielen, pcur_bss->ie_length-12);

		if (p && ht_ielen > 0) {

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

			bw_40MHz = (pmlmeext->cur_bwmode && (HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH & pmlmeinfo->HT_info.infos[0])) ? 1 : 0;

drivers/staging/rtl8188eu/core/rtw_mlme.c

+19 −19
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ u16 rtw_get_capability(struct wlan_bssid_ex *bss) 
{

	__le16	val;



	memcpy((u8 *)&val, rtw_get_capability_from_ie(bss->IEs), 2);

	memcpy((u8 *)&val, rtw_get_capability_from_ie(bss->ies), 2);



	return le16_to_cpu(val);

}
@@ -318,8 +318,8 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst) 
	 u16 s_cap, d_cap;

	__le16 le_scap, le_dcap;



	memcpy((u8 *)&le_scap, rtw_get_capability_from_ie(src->IEs), 2);

	memcpy((u8 *)&le_dcap, rtw_get_capability_from_ie(dst->IEs), 2);

	memcpy((u8 *)&le_scap, rtw_get_capability_from_ie(src->ies), 2);

	memcpy((u8 *)&le_dcap, rtw_get_capability_from_ie(dst->ies), 2);



	s_cap = le16_to_cpu(le_scap);

	d_cap = le16_to_cpu(le_dcap);
@@ -399,8 +399,8 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex 
	if ((check_fwstate(pmlmepriv, _FW_LINKED) == true) &&

	    (is_same_network(&(pmlmepriv->cur_network.network), pnetwork))) {

		update_network(&(pmlmepriv->cur_network.network), pnetwork, adapter, true);

		rtw_update_protection(adapter, (pmlmepriv->cur_network.network.IEs) + sizeof(struct ndis_802_11_fixed_ie),

				      pmlmepriv->cur_network.network.IELength);

		rtw_update_protection(adapter, (pmlmepriv->cur_network.network.ies) + sizeof(struct ndis_802_11_fixed_ie),

				      pmlmepriv->cur_network.network.ie_length);

	}

}
@@ -483,7 +483,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t 
		pnetwork->last_scanned = jiffies;



		/* target.Reserved[0]== 1, means that scanned network is a bcn frame. */

		if ((pnetwork->network.IELength > target->IELength) && (target->Reserved[0] == 1))

		if ((pnetwork->network.ie_length > target->ie_length) && (target->Reserved[0] == 1))

			update_ie = false;



		update_network(&(pnetwork->network), target, adapter, update_ie);
@@ -524,7 +524,7 @@ static int rtw_is_desired_network(struct adapter *adapter, struct wlan_network * 
	privacy = pnetwork->network.Privacy;



	if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) {

		if (rtw_get_wps_ie(pnetwork->network.IEs+_FIXED_IE_LENGTH_, pnetwork->network.IELength-_FIXED_IE_LENGTH_, NULL, &wps_ielen))

		if (rtw_get_wps_ie(pnetwork->network.ies+_FIXED_IE_LENGTH_, pnetwork->network.ie_length-_FIXED_IE_LENGTH_, NULL, &wps_ielen))

			return true;

		else

			return false;
@@ -576,11 +576,11 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf) 
		if (!memcmp(&(pmlmepriv->cur_network.network.MacAddress), pnetwork->MacAddress, ETH_ALEN)) {

			struct wlan_network *ibss_wlan = NULL;



			memcpy(pmlmepriv->cur_network.network.IEs, pnetwork->IEs, 8);

			memcpy(pmlmepriv->cur_network.network.ies, pnetwork->ies, 8);

			spin_lock_bh(&(pmlmepriv->scanned_queue.lock));

			ibss_wlan = rtw_find_network(&pmlmepriv->scanned_queue,  pnetwork->MacAddress);

			if (ibss_wlan) {

				memcpy(ibss_wlan->network.IEs, pnetwork->IEs, 8);

				memcpy(ibss_wlan->network.ies, pnetwork->ies, 8);

				spin_unlock_bh(&pmlmepriv->scanned_queue.lock);

				goto exit;

			}
@@ -947,9 +947,9 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net 


	/*  why not use ptarget_wlan?? */

	memcpy(&cur_network->network, &pnetwork->network, pnetwork->network.Length);

	/*  some IEs in pnetwork is wrong, so we should use ptarget_wlan IEs */

	cur_network->network.IELength = ptarget_wlan->network.IELength;

	memcpy(&cur_network->network.IEs[0], &ptarget_wlan->network.IEs[0], MAX_IE_SZ);

	/*  some ies in pnetwork is wrong, so we should use ptarget_wlan ies */

	cur_network->network.ie_length = ptarget_wlan->network.ie_length;

	memcpy(&cur_network->network.ies[0], &ptarget_wlan->network.ies[0], MAX_IE_SZ);



	cur_network->aid = pnetwork->join_res;
@@ -977,10 +977,10 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net 
		break;

	}



	rtw_update_protection(padapter, (cur_network->network.IEs) +

	rtw_update_protection(padapter, (cur_network->network.ies) +

			      sizeof(struct ndis_802_11_fixed_ie),

			      (cur_network->network.IELength));

	rtw_update_ht_cap(padapter, cur_network->network.IEs, cur_network->network.IELength);

			      (cur_network->network.ie_length));

	rtw_update_ht_cap(padapter, cur_network->network.ies, cur_network->network.ie_length);

}



/* Notes: the function could be > passive_level (the same context as Rx tasklet) */
@@ -1665,7 +1665,7 @@ err_free_cmd: 
	return res;

}



/* adjust IEs for rtw_joinbss_cmd in WMM */

/* adjust ies for rtw_joinbss_cmd in WMM */

int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, uint initial_out_len)

{

	unsigned	int ielength = 0;
@@ -1861,11 +1861,11 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter) 
	/*  2. IE */



	sz = rtw_generate_ie(pregistrypriv);

	pdev_network->IELength = sz;

	pdev_network->ie_length = sz;

	pdev_network->Length = get_wlan_bssid_ex_sz((struct wlan_bssid_ex  *)pdev_network);



	/* notes: translate IELength & Length after assign the Length to cmdsz in createbss_cmd(); */

	/* pdev_network->IELength = cpu_to_le32(sz); */

	/* notes: translate ie_length & Length after assign the Length to cmdsz in createbss_cmd(); */

	/* pdev_network->ie_length = cpu_to_le32(sz); */

}



void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter)

CRA Git | Maintained and supported by SUSTech CRA and CCSE