[PATCH v2 16/21] staging: rtl8723bs: replace _MME_IE_

[Ross Schmidt]

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

Signed-off-by: Ross Schmidt <ross.schm....@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_security.c | 2 +-
 drivers/staging/rtl8723bs/core/rtw_xmit.c     | 2 +-
 drivers/staging/rtl8723bs/include/wifi.h      | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c 
b/drivers/staging/rtl8723bs/core/rtw_security.c
index 33f5d3c5ac36..a83d8f7f611c 100644
--- a/drivers/staging/rtl8723bs/core/rtw_security.c
+++ b/drivers/staging/rtl8723bs/core/rtw_security.c
@@ -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;
diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c 
b/drivers/staging/rtl8723bs/core/rtw_xmit.c
index 187a2aa77a55..41632fa0b3c8 100644
--- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
@@ -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 */
diff --git a/drivers/staging/rtl8723bs/include/wifi.h 
b/drivers/staging/rtl8723bs/include/wifi.h
index 29621fce6a83..82dfdafb38fc 100644
--- a/drivers/staging/rtl8723bs/include/wifi.h
+++ b/drivers/staging/rtl8723bs/include/wifi.h
@@ -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
-- 
2.25.1