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

Commit 858e6658 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: issue_probersp23a(): various cleanups 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cfe4ecdc

drivers/staging/rtl8723au/core/rtw_mlme_ext.c

+17 −18
Original line number Diff line number Diff line
@@ -2484,8 +2484,8 @@ void issue_probersp23a(struct rtw_adapter *padapter, unsigned char *da, 


	/* DBG_8723A("%s\n", __func__); */



	if ((pmgntframe = alloc_mgtxmitframe23a(pxmitpriv)) == NULL)

	{

	pmgntframe = alloc_mgtxmitframe23a(pxmitpriv);

	if (!pmgntframe) {

		DBG_8723A("%s, alloc mgnt frame fail\n", __func__);

		return;

	}
@@ -2496,7 +2496,7 @@ void issue_probersp23a(struct rtw_adapter *padapter, unsigned char *da, 


	memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET);



	pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;

	pframe = (u8 *)pmgntframe->buf_addr + TXDESC_OFFSET;

	pwlanhdr = (struct ieee80211_hdr *)pframe;



	mac = myid(&padapter->eeprompriv);
@@ -2528,8 +2528,7 @@ void issue_probersp23a(struct rtw_adapter *padapter, unsigned char *da, 
					    &wps_ielen);



		/* inerset & update wps_probe_resp_ie */

		if ((pmlmepriv->wps_probe_resp_ie != NULL) && pwps_ie &&

		    (wps_ielen > 0)) {

		if (pmlmepriv->wps_probe_resp_ie && pwps_ie && wps_ielen > 0) {

			uint wps_offset, remainder_ielen;

			u8 *premainder_ie;
@@ -2546,14 +2545,14 @@ void issue_probersp23a(struct rtw_adapter *padapter, unsigned char *da, 


			/* to get ie data len */

			wps_ielen = (uint)pmlmepriv->wps_probe_resp_ie[1];

			if ((wps_offset+wps_ielen+2)<= MAX_IE_SZ) {

			if (wps_offset + wps_ielen + 2 <= MAX_IE_SZ) {

				memcpy(pframe, pmlmepriv->wps_probe_resp_ie,

				       wps_ielen+2);

				pframe += wps_ielen+2;

				pattrib->pktlen += wps_ielen+2;

			}



			if ((wps_offset+wps_ielen+2+remainder_ielen) <=

			if (wps_offset + wps_ielen + 2 + remainder_ielen <=

			    MAX_IE_SZ) {

				memcpy(pframe, premainder_ie, remainder_ielen);

				pframe += remainder_ielen;
@@ -2571,7 +2570,7 @@ void issue_probersp23a(struct rtw_adapter *padapter, unsigned char *da, 


		ssid_ie = rtw_get_ie23a(ies + _FIXED_IE_LENGTH_, WLAN_EID_SSID,

					&ssid_ielen,

					(pframe-ies)-_FIXED_IE_LENGTH_);

					pframe - ies - _FIXED_IE_LENGTH_);



		ssid_ielen_diff = cur_network->Ssid.ssid_len - ssid_ielen;
@@ -2579,14 +2578,13 @@ void issue_probersp23a(struct rtw_adapter *padapter, unsigned char *da, 
			uint remainder_ielen;

			u8 *remainder_ie;

			remainder_ie = ssid_ie + 2;

			remainder_ielen = (pframe-remainder_ie);

			remainder_ielen = pframe - remainder_ie;



			DBG_8723A_LEVEL(_drv_warning_, FUNC_ADPT_FMT

					" remainder_ielen > MAX_IE_SZ\n",

					FUNC_ADPT_ARG(padapter));

			if (remainder_ielen > MAX_IE_SZ) {

			if (remainder_ielen > MAX_IE_SZ)

				remainder_ielen = MAX_IE_SZ;

			}



			memcpy(buf, remainder_ie, remainder_ielen);

			memcpy(remainder_ie + ssid_ielen_diff, buf,
@@ -2627,7 +2625,8 @@ void issue_probersp23a(struct rtw_adapter *padapter, unsigned char *da, 
		/*  SSID */

		pframe = rtw_set_ie23a(pframe, WLAN_EID_SSID,

				       cur_network->Ssid.ssid_len,

				    cur_network->Ssid.ssid, &pattrib->pktlen);

				       cur_network->Ssid.ssid,

				       &pattrib->pktlen);



		/*  supported rates... */

		rate_len = rtw_get_rateset_len23a(cur_network->SupportedRates);