staging: rtl8723bs: replace _ERPINFO_IE_

Replace unique _ERPINFO_IE_ macro with kernel provided WLAN_EID_ERP_INFO
from linux/ieee80211.h.

Signed-off-by: Ross Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201208040733.379197-14-ross.schm.dev@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
index 139350288d1b3052186dd97e4f78775f1dfb0328..5e93a85cb6ce78eb52517b0a436cf9a0c476e04f 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -1059,7 +1059,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
        /* parsing ERP_IE */
        p = rtw_get_ie(
                ie + _BEACON_IE_OFFSET_,
-               _ERPINFO_IE_,
+               WLAN_EID_ERP_INFO,
                &ie_len,
                (pbss_network->IELength - _BEACON_IE_OFFSET_)
        );
@@ -1585,7 +1585,7 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter)
        /* parsing ERP_IE */
        p = rtw_get_ie(
                ie + _BEACON_IE_OFFSET_,
-               _ERPINFO_IE_,
+               WLAN_EID_ERP_INFO,
                &len,
                (pnetwork->IELength - _BEACON_IE_OFFSET_)
        );
@@ -1768,7 +1768,7 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
 
                break;
 
-       case _ERPINFO_IE_:
+       case WLAN_EID_ERP_INFO:
 
                update_bcn_erpinfo_ie(padapter);
 
@@ -1964,7 +1964,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
 
                        if (pmlmepriv->num_sta_non_erp == 1) {
                                beacon_updated = true;
-                               update_beacon(padapter, _ERPINFO_IE_, NULL, true);
+                               update_beacon(padapter, WLAN_EID_ERP_INFO, NULL, true);
                        }
                }
        } else {
@@ -1975,7 +1975,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
 
                        if (pmlmepriv->num_sta_non_erp == 0) {
                                beacon_updated = true;
-                               update_beacon(padapter, _ERPINFO_IE_, NULL, true);
+                               update_beacon(padapter, WLAN_EID_ERP_INFO, NULL, true);
                        }
                }
        }
@@ -2086,7 +2086,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)
                pmlmepriv->num_sta_non_erp--;
                if (pmlmepriv->num_sta_non_erp == 0) {
                        beacon_updated = true;
-                       update_beacon(padapter, _ERPINFO_IE_, NULL, true);
+                       update_beacon(padapter, WLAN_EID_ERP_INFO, NULL, true);
                }
        }
 

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 93380493e8dc17285b2dc801a05952768f4e769f..5d56fbf0c1fe1579c4cd6202c487308a1099ac3c 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -1705,7 +1705,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame)
                        HT_info_handler(padapter, pIE);
                        break;
 
-               case _ERPINFO_IE_:
+               case WLAN_EID_ERP_INFO:
                        ERP_IE_handler(padapter, pIE);
                        break;
 
@@ -2555,7 +2555,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
                pframe = rtw_set_ie(pframe, WLAN_EID_IBSS_PARAMS, 2, (unsigned char *)(&ATIMWindow), &pattrib->pktlen);
 
                /* ERP IE */
-               pframe = rtw_set_ie(pframe, _ERPINFO_IE_, 1, &erpinfo, &pattrib->pktlen);
+               pframe = rtw_set_ie(pframe, WLAN_EID_ERP_INFO, 1, &erpinfo, &pattrib->pktlen);
        }
 
 
@@ -2758,7 +2758,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
                        pframe = rtw_set_ie(pframe, WLAN_EID_IBSS_PARAMS, 2, (unsigned char *)(&ATIMWindow), &pattrib->pktlen);
 
                        /* ERP IE */
-                       pframe = rtw_set_ie(pframe, _ERPINFO_IE_, 1, &erpinfo, &pattrib->pktlen);
+                       pframe = rtw_set_ie(pframe, WLAN_EID_ERP_INFO, 1, &erpinfo, &pattrib->pktlen);
                }
 
 

diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index ff5125b3374977ecc358dce50a33e473b58ba5a2..e8e91e24c04d3f4c8183480f25f5177a6e0ce8e1 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -1479,7 +1479,7 @@ void update_beacon_info(struct adapter *padapter, u8 *pframe, uint pkt_len, stru
                        bwmode_update_check(padapter, pIE);
                        break;
 
-               case _ERPINFO_IE_:
+               case WLAN_EID_ERP_INFO:
                        ERP_IE_handler(padapter, pIE);
                        VCS_update(padapter, psta);
                        break;

diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c
index 1d62ce501e80d990d8a35b11131a6b43388f8381..187a2aa77a55d2791f78297b94650959c1d7ae5d 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
@@ -1447,7 +1447,7 @@ void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len)
 
        case AUTO_VCS:
        default:
-               perp = rtw_get_ie(ie, _ERPINFO_IE_, &erp_len, ie_len);
+               perp = rtw_get_ie(ie, WLAN_EID_ERP_INFO, &erp_len, ie_len);
                if (!perp) {
                        pxmitpriv->vcs = NONE_VCS;
                } else {

diff --git a/drivers/staging/rtl8723bs/include/wifi.h b/drivers/staging/rtl8723bs/include/wifi.h
index 2f13bbe38f74ecf828163b61781728ada01feeab..ff8865d1d846af58695a239161d8799ea4190b49 100644 (file)
--- a/drivers/staging/rtl8723bs/include/wifi.h
+++ b/drivers/staging/rtl8723bs/include/wifi.h
@@ -389,7 +389,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)
 
 #define _SUPPORTED_CH_IE_              36
 #define _CH_SWTICH_ANNOUNCE_   37      /* Secondary Channel Offset */
-#define _ERPINFO_IE_                   42
 #define _EXT_SUPPORTEDRATES_IE_        50
 
 #define _FTIE_                                         55