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

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.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fc41e961
...@@ -1819,7 +1819,7 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe) ...@@ -1819,7 +1819,7 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
/* save the frame body + MME */ /* save the frame body + MME */
memcpy(BIP_AAD+BIP_AAD_SIZE, pframe+WLAN_HDR_A3_LEN, pattrib->pkt_len-WLAN_HDR_A3_LEN); memcpy(BIP_AAD+BIP_AAD_SIZE, pframe+WLAN_HDR_A3_LEN, pattrib->pkt_len-WLAN_HDR_A3_LEN);
/* find MME IE pointer */ /* 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 */ /* Baron */
if (p) { if (p) {
u16 keyid = 0; u16 keyid = 0;
......
...@@ -1292,7 +1292,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit ...@@ -1292,7 +1292,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit
pmlmeext->mgnt_80211w_IPN++; pmlmeext->mgnt_80211w_IPN++;
/* add MME IE with MIC all zero, MME string doesn't include element id and length */ /* 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); MME, &pattrib->pktlen);
pattrib->last_txcmdsz = pattrib->pktlen; pattrib->last_txcmdsz = pattrib->pktlen;
/* total frame length - header length */ /* total frame length - header length */
......
...@@ -395,7 +395,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe) ...@@ -395,7 +395,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)
#define _SRC_IE_ 59 #define _SRC_IE_ 59
#define _RIC_Descriptor_IE_ 75 #define _RIC_Descriptor_IE_ 75
#define _MME_IE_ 76 /* 802.11w Management MIC element */
#define _LINK_ID_IE_ 101 #define _LINK_ID_IE_ 101
#define _CH_SWITCH_TIMING_ 104 #define _CH_SWITCH_TIMING_ 104
#define _PTI_BUFFER_STATUS_ 106 #define _PTI_BUFFER_STATUS_ 106
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment