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

staging: rtl8723bs: replace _CHLGETXT_IE_ 



Replace unique _CHLGETXT_IE_ macro with kernel provided WLAN_EID_CHALLENGE
from linux/ieee80211.h.

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


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

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+4 −4
Original line number Diff line number Diff line
@@ -1028,7 +1028,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) 
			/* checking for challenging txt... */

			DBG_871X("checking for challenging txt...\n");



			p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + 4 + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, (int *)&ie_len,

			p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + 4 + _AUTH_IE_OFFSET_, WLAN_EID_CHALLENGE, (int *)&ie_len,

					len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ - 4);



			if ((p == NULL) || (ie_len <= 0)) {
@@ -1124,7 +1124,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram 
	if (seq == 2) {

		if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) {

			 /*  legendary shared system */

			p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, (int *)&len,

			p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_, WLAN_EID_CHALLENGE, (int *)&len,

				pkt_len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_);



			if (p == NULL) {
@@ -3026,7 +3026,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short 


		/*  added challenging text... */

		if ((psta->auth_seq == 2) && (psta->state & WIFI_FW_AUTH_STATE) && (use_shared_key == 1))

			pframe = rtw_set_ie(pframe, _CHLGETXT_IE_, 128, psta->chg_txt, &(pattrib->pktlen));

			pframe = rtw_set_ie(pframe, WLAN_EID_CHALLENGE, 128, psta->chg_txt, &(pattrib->pktlen));



	} else {

		memcpy(pwlanhdr->addr1, get_my_bssid(&pmlmeinfo->network), ETH_ALEN);
@@ -3066,7 +3066,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short 


		/*  then checking to see if sending challenging text... */

		if ((pmlmeinfo->auth_seq == 3) && (pmlmeinfo->state & WIFI_FW_AUTH_STATE) && (use_shared_key == 1)) {

			pframe = rtw_set_ie(pframe, _CHLGETXT_IE_, 128, pmlmeinfo->chg_txt, &(pattrib->pktlen));

			pframe = rtw_set_ie(pframe, WLAN_EID_CHALLENGE, 128, pmlmeinfo->chg_txt, &(pattrib->pktlen));



			SetPrivacy(fctrl);

drivers/staging/rtl8723bs/include/wifi.h

+0 −1
Original line number Diff line number Diff line
@@ -387,7 +387,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe) 


#define _FIXED_IE_LENGTH_			_BEACON_IE_OFFSET_



#define _CHLGETXT_IE_			16

#define _SUPPORTED_CH_IE_		36

#define _CH_SWTICH_ANNOUNCE_	37	/* Secondary Channel Offset */

#define _ERPINFO_IE_			42

CRA Git | Maintained and supported by SUSTech CRA and CCSE