Commit b05cc3a9 authored by Ross Schmidt's avatar Ross Schmidt Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: use WLAN_EID_VENDOR_SPECIFIC 



Replace unique WLAN_EID_GENERIC, _WPA_IE_ID_, _SSN_IE_1_, and
_VENDOR_SPECIFIC_IE_ macros with kernel provided WLAN_EID_VENDOR_SPECIFIC
from linux/ieee80211.h.

Signed-off-by: default avatarRoss Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201208040733.379197-3-ross.schm.dev@gmail.com


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

drivers/staging/rtl8723bs/core/rtw_ap.c

+3 −3
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	for (p = ie + _BEACON_IE_OFFSET_; ; p += (ie_len + 2)) {

		p = rtw_get_ie(

			p,

			_SSN_IE_1_,

			WLAN_EID_VENDOR_SPECIFIC,

			&ie_len,

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

		);
@@ -1146,7 +1146,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
		for (p = ie + _BEACON_IE_OFFSET_; ; p += (ie_len + 2)) {

			p = rtw_get_ie(

				p,

				_VENDOR_SPECIFIC_IE_,

				WLAN_EID_VENDOR_SPECIFIC,

				&ie_len,

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

			);
@@ -1792,7 +1792,7 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx) 


		break;



	case _VENDOR_SPECIFIC_IE_:

	case WLAN_EID_VENDOR_SPECIFIC:



		update_bcn_vendor_spec_ie(padapter, oui);

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

+6 −6
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ unsigned char *rtw_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit) 
	__le16 le_tmp;



	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... */
@@ -471,7 +471,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;

	}
@@ -667,7 +667,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));



				if (wpa_ie) {
@@ -715,7 +715,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))) {

		/* DBG_8192C("==> found WPS_IE.....\n"); */

		*wps_ielen = ie_ptr[1]+2;

		match = true;
@@ -749,7 +749,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)
@@ -788,7 +788,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;

	}

drivers/staging/rtl8723bs/core/rtw_mlme.c

+3 −3
Original line number Diff line number Diff line
@@ -2359,7 +2359,7 @@ sint rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in 
	memcpy(out_ie, in_ie, 12);

	ielength = 12;

	if ((ndisauthmode == Ndis802_11AuthModeWPA) || (ndisauthmode == Ndis802_11AuthModeWPAPSK))

			authmode = _WPA_IE_ID_;

			authmode = WLAN_EID_VENDOR_SPECIFIC;

	if ((ndisauthmode == Ndis802_11AuthModeWPA2) || (ndisauthmode == Ndis802_11AuthModeWPA2PSK))

			authmode = _WPA2_IE_ID_;
@@ -2367,7 +2367,7 @@ sint 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 == _WPA2_IE_ID_)) {

		/* copy RSN or SSN */

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

		/* debug for CONFIG_IEEE80211W
@@ -2574,7 +2574,7 @@ void rtw_build_wmm_ie_ht(struct adapter *padapter, u8 *out_ie, uint *pout_len) 


	if (padapter->mlmepriv.qospriv.qos_option == 0) {

		out_len = *pout_len;

		pframe = rtw_set_ie(out_ie+out_len, _VENDOR_SPECIFIC_IE_,

		pframe = rtw_set_ie(out_ie+out_len, WLAN_EID_VENDOR_SPECIFIC,

							_WMM_IE_Length_, WMM_IE, pout_len);



		padapter->mlmepriv.qospriv.qos_option = 1;

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+10 −10
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame) 
		u8 RC_OUI[4] = {0x00, 0xE0, 0x4C, 0x0A};

		/* EID[1] + EID_LEN[1] + RC_OUI[4] + MAC[6] + PairingID[2] + ChannelNum[2] */



		p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _VENDOR_SPECIFIC_IE_, (int *)&ielen,

		p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, WLAN_EID_VENDOR_SPECIFIC, (int *)&ielen,

			len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_);



		if (!p || ielen != 14)
@@ -1445,7 +1445,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) 
	if (pmlmepriv->qospriv.qos_option) {

		p = pframe + WLAN_HDR_A3_LEN + ie_offset; ie_len = 0;

		for (;;) {

			p = rtw_get_ie(p, _VENDOR_SPECIFIC_IE_, &ie_len, pkt_len - WLAN_HDR_A3_LEN - ie_offset);

			p = rtw_get_ie(p, WLAN_EID_VENDOR_SPECIFIC, &ie_len, pkt_len - WLAN_HDR_A3_LEN - ie_offset);

			if (p) {

				if (!memcmp(p+2, WMM_IE, 6)) {
@@ -1692,7 +1692,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame) 
		pIE = (struct ndis_80211_var_ie *)(pframe + i);



		switch (pIE->ElementID) {

		case _VENDOR_SPECIFIC_IE_:

		case WLAN_EID_VENDOR_SPECIFIC:

			if (!memcmp(pIE->data, WMM_PARA_OUI, 6))	/* WMM */

				WMM_param_handler(padapter, pIE);

			break;
@@ -2796,7 +2796,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p 
		memcpy(&RC_INFO[10], (u8 *)&psta->pid, 2);

		memcpy(&RC_INFO[12], (u8 *)&cu_ch, 2);



		pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, sizeof(RC_INFO), RC_INFO, &pattrib->pktlen);

		pframe = rtw_set_ie(pframe, WLAN_EID_VENDOR_SPECIFIC, sizeof(RC_INFO), RC_INFO, &pattrib->pktlen);

	}

}

#endif /* CONFIG_AUTO_AP_MODE */
@@ -3188,7 +3188,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i 
		unsigned char WMM_PARA_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01};



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

			pbuf = rtw_get_ie(pbuf, _VENDOR_SPECIFIC_IE_, &ie_len, (pnetwork->IELength - _BEACON_IE_OFFSET_ - (ie_len + 2)));

			pbuf = rtw_get_ie(pbuf, WLAN_EID_VENDOR_SPECIFIC, &ie_len, (pnetwork->IELength - _BEACON_IE_OFFSET_ - (ie_len + 2)));

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

				memcpy(pframe, pbuf, ie_len+2);

				pframe += (ie_len+2);
@@ -3205,7 +3205,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i 
	}



	if (pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_REALTEK) {

		pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 6, REALTEK_96B_IE, &(pattrib->pktlen));

		pframe = rtw_set_ie(pframe, WLAN_EID_VENDOR_SPECIFIC, 6, REALTEK_96B_IE, &(pattrib->pktlen));

	}



	/* add WPS IE ie for wps 2.0 */
@@ -3350,7 +3350,7 @@ void issue_assocreq(struct adapter *padapter) 
		pIE = (struct ndis_80211_var_ie *)(pmlmeinfo->network.IEs + i);



		switch (pIE->ElementID) {

		case _VENDOR_SPECIFIC_IE_:

		case WLAN_EID_VENDOR_SPECIFIC:

			if ((!memcmp(pIE->data, RTW_WPA_OUI, 4)) ||

					(!memcmp(pIE->data, WMM_OUI, 4)) ||

					(!memcmp(pIE->data, WPS_OUI, 4))) {
@@ -3365,7 +3365,7 @@ void issue_assocreq(struct adapter *padapter) 
					vs_ie_length = 14;

				}



				pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, vs_ie_length, pIE->data, &(pattrib->pktlen));

				pframe = rtw_set_ie(pframe, WLAN_EID_VENDOR_SPECIFIC, vs_ie_length, pIE->data, &(pattrib->pktlen));

			}

			break;
@@ -3393,7 +3393,7 @@ void issue_assocreq(struct adapter *padapter) 
	}



	if (pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_REALTEK)

		pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 6, REALTEK_96B_IE, &(pattrib->pktlen));

		pframe = rtw_set_ie(pframe, WLAN_EID_VENDOR_SPECIFIC, 6, REALTEK_96B_IE, &(pattrib->pktlen));





	pattrib->last_txcmdsz = pattrib->pktlen;
@@ -6173,7 +6173,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) 
		pIE = (struct ndis_80211_var_ie *)(pnetwork->IEs + i);



		switch (pIE->ElementID) {

		case _VENDOR_SPECIFIC_IE_:/* Get WMM IE. */

		case WLAN_EID_VENDOR_SPECIFIC:/* Get WMM IE. */

			if (!memcmp(pIE->data, WMM_OUI, 4))

				WMM_param_handler(padapter, pIE);

			break;

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+3 −3
Original line number Diff line number Diff line
@@ -1466,7 +1466,7 @@ void update_beacon_info(struct adapter *padapter, u8 *pframe, uint pkt_len, stru 
		pIE = (struct ndis_80211_var_ie *)(pframe + (_BEACON_IE_OFFSET_ + WLAN_HDR_A3_LEN) + i);



		switch (pIE->ElementID) {

		case _VENDOR_SPECIFIC_IE_:

		case WLAN_EID_VENDOR_SPECIFIC:

			/* to update WMM parameter set while receiving beacon */

			if (!memcmp(pIE->data, WMM_PARA_OUI, 6) && pIE->Length == WLAN_WMM_LEN)	/* WMM */

				if (WMM_param_handler(padapter, pIE))
@@ -1505,7 +1505,7 @@ unsigned int is_ap_in_tkip(struct adapter *padapter) 
			pIE = (struct ndis_80211_var_ie *)(pmlmeinfo->network.IEs + i);



			switch (pIE->ElementID) {

			case _VENDOR_SPECIFIC_IE_:

			case WLAN_EID_VENDOR_SPECIFIC:

				if ((!memcmp(pIE->data, RTW_WPA_OUI, 4)) && (!memcmp((pIE->data + 12), WPA_TKIP_CIPHER, 4)))

					return true;
@@ -1581,7 +1581,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len) 
		pIE = (struct ndis_80211_var_ie *)(pframe + i);



		switch (pIE->ElementID) {

		case _VENDOR_SPECIFIC_IE_:

		case WLAN_EID_VENDOR_SPECIFIC:

			if ((!memcmp(pIE->data, ARTHEROS_OUI1, 3)) || (!memcmp(pIE->data, ARTHEROS_OUI2, 3))) {

				DBG_871X("link to Artheros AP\n");

				return HT_IOT_PEER_ATHEROS;