Commit 4288e5fd authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: rtl8723a_cmd.c: Use the kernel's WLAN_EID_* definitions 



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

drivers/staging/rtl8723au/hal/rtl8723a_cmd.c

+12 −6
Original line number Diff line number Diff line
@@ -255,30 +255,36 @@ static void ConstructBeacon(struct rtw_adapter *padapter, u8 *pframe, u32 *pLeng 
	/* below for ad-hoc mode */



	/*  SSID */

	pframe = rtw_set_ie23a(pframe, _SSID_IE_, cur_network->Ssid.ssid_len,

	pframe = rtw_set_ie23a(pframe, WLAN_EID_SSID,

			       cur_network->Ssid.ssid_len,

			       cur_network->Ssid.ssid, &pktlen);



	/*  supported rates... */

	rate_len = rtw_get_rateset_len23a(cur_network->SupportedRates);

	pframe = rtw_set_ie23a(pframe, _SUPPORTEDRATES_IE_, ((rate_len > 8) ?

	pframe = rtw_set_ie23a(pframe, WLAN_EID_SUPP_RATES, ((rate_len > 8) ?

			       8 : rate_len), cur_network->SupportedRates, &pktlen);



	/*  DS parameter set */

	pframe = rtw_set_ie23a(pframe, _DSSET_IE_, 1, (unsigned char *)&cur_network->Configuration.DSConfig, &pktlen);

	pframe = rtw_set_ie23a(pframe, WLAN_EID_DS_PARAMS, 1, (unsigned char *)

			       &cur_network->Configuration.DSConfig, &pktlen);



	if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) {

		u32 ATIMWindow;

		/*  IBSS Parameter Set... */

		/* ATIMWindow = cur->Configuration.ATIMWindow; */

		ATIMWindow = 0;

		pframe = rtw_set_ie23a(pframe, _IBSS_PARA_IE_, 2, (unsigned char *)(&ATIMWindow), &pktlen);

		pframe = rtw_set_ie23a(pframe, WLAN_EID_IBSS_PARAMS, 2,

				       (unsigned char *)(&ATIMWindow), &pktlen);

	}



	/* todo: ERP IE */



	/*  EXTERNDED SUPPORTED RATE */

	if (rate_len > 8)

		pframe = rtw_set_ie23a(pframe, _EXT_SUPPORTEDRATES_IE_, (rate_len - 8), (cur_network->SupportedRates + 8), &pktlen);

		pframe = rtw_set_ie23a(pframe, WLAN_EID_EXT_SUPP_RATES,

				       (rate_len - 8),

				       (cur_network->SupportedRates + 8),

				       &pktlen);



	/* todo:HT for adhoc */