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

staging: rtl8723bs: replace _MME_IE_ 



Replace unique _MME_IE_ macro with kernel provided WLAN_EID_MMIE from
linux/ieee80211.h.

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


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

drivers/staging/rtl8723bs/core/rtw_security.c

+1 −1
Original line number Diff line number Diff line
@@ -1819,7 +1819,7 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe) 
	/* save the frame body + MME */

	memcpy(BIP_AAD+BIP_AAD_SIZE, pframe+WLAN_HDR_A3_LEN, pattrib->pkt_len-WLAN_HDR_A3_LEN);

	/* find MME IE pointer */

	p = rtw_get_ie(BIP_AAD+BIP_AAD_SIZE, _MME_IE_, &len, pattrib->pkt_len-WLAN_HDR_A3_LEN);

	p = rtw_get_ie(BIP_AAD+BIP_AAD_SIZE, WLAN_EID_MMIE, &len, pattrib->pkt_len-WLAN_HDR_A3_LEN);

	/* Baron */

	if (p) {

		u16 keyid = 0;

drivers/staging/rtl8723bs/core/rtw_xmit.c

+1 −1
Original line number Diff line number Diff line
@@ -1292,7 +1292,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit 
		pmlmeext->mgnt_80211w_IPN++;



		/* add MME IE with MIC all zero, MME string doesn't include element id and length */

		pframe = rtw_set_ie(pframe, _MME_IE_, 16,

		pframe = rtw_set_ie(pframe, WLAN_EID_MMIE, 16,

				    MME, &pattrib->pktlen);

		pattrib->last_txcmdsz = pattrib->pktlen;

		/*  total frame length - header length */

drivers/staging/rtl8723bs/include/wifi.h

+0 −1
Original line number Diff line number Diff line
@@ -395,7 +395,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe) 
#define _SRC_IE_				59



#define _RIC_Descriptor_IE_			75

#define _MME_IE_					76 /* 802.11w Management MIC element */

#define _LINK_ID_IE_					101

#define _CH_SWITCH_TIMING_		104

#define _PTI_BUFFER_STATUS_		106

CRA Git | Maintained and supported by SUSTech CRA and CCSE