From 81a5bb2aa201c053562cf62fc44dc6d37b9688d7 Mon Sep 17 00:00:00 2001 From: Carlos Garces Date: Thu, 21 Oct 2021 18:05:27 +0200 Subject: [PATCH] Replace custom Information Element IDs Use enum ieee80211_eid from linux/ieee80211.h Fix 3555bdb25800fe9fb280c64663ab2e3a46762d63 --- core/rtw_mlme_ext.c | 2 +- core/rtw_rm.c | 6 +++--- core/rtw_rm_fsm.c | 2 +- core/rtw_tdls.c | 10 +++++----- core/rtw_wlan_util.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index ce14057..217c3b1 100644 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -11485,7 +11485,7 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid) u8 noc; /* number of channel */ u8 j, k; - ie = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _COUNTRY_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_); + ie = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, WLAN_EID_COUNTRY, &len, bssid->IELength - _FIXED_IE_LENGTH_); if (!ie) return; if (len < 6) diff --git a/core/rtw_rm.c b/core/rtw_rm.c index 5874918..58797fe 100644 --- a/core/rtw_rm.c +++ b/core/rtw_rm.c @@ -812,7 +812,7 @@ int rm_recv_radio_mens_req(_adapter *padapter, RTW_INFO("RM: meas_type = %d\n", prm->q.m_type); #endif - if (prm->q.e_id != _MEAS_REQ_IE_) /* 38 */ + if (prm->q.e_id != WLAN_EID_MEASURE_REQUEST) /* 38 */ return _FALSE; switch (prm->q.m_type) { @@ -894,7 +894,7 @@ int rm_recv_radio_mens_rep(_adapter *padapter, RTW_INFO("RM: meas_mode = %d\n", prm->p.m_mode); RTW_INFO("RM: meas_type = %d\n", prm->p.m_type); #endif - if (prm->p.e_id != _MEAS_RSP_IE_) /* 39 */ + if (prm->p.e_id != WLAN_EID_MEASURE_REPORT) /* 39 */ return _FALSE; RTW_INFO("RM: recv %s\n", rm_type_rep_name(prm->p.m_type)); @@ -2280,7 +2280,7 @@ static void rm_dbg_add_meas(_adapter *padapter, char *s) return; } prm->q.category = WLAN_CATEGORY_RADIO_MEASUREMENT; - prm->q.e_id = _MEAS_REQ_IE_; /* 38 */ + prm->q.e_id = WLAN_EID_MEASURE_REQUEST; /* 38 */ if (prm->q.action_code == RM_ACT_RADIO_MEAS_REQ) sprintf(pstr(s), "\nAdd rmid=%x, meas_type=%s ok\n", diff --git a/core/rtw_rm_fsm.c b/core/rtw_rm_fsm.c index 19fef5f..6795150 100644 --- a/core/rtw_rm_fsm.c +++ b/core/rtw_rm_fsm.c @@ -528,7 +528,7 @@ static int rm_state_idle(struct rm_obj *prm, enum RM_EV_ID evid) /* copy attrib from meas_req to meas_rep */ prm->p.action_code = RM_ACT_RADIO_MEAS_REP; prm->p.diag_token = prm->q.diag_token; - prm->p.e_id = _MEAS_RSP_IE_; + prm->p.e_id = WLAN_EID_MEASURE_REPORT; prm->p.m_token = prm->q.m_token; prm->p.m_type = prm->q.m_type; prm->p.rpt = prm->q.rpt; diff --git a/core/rtw_tdls.c b/core/rtw_tdls.c index 14c82a5..2fba19c 100644 --- a/core/rtw_tdls.c +++ b/core/rtw_tdls.c @@ -718,7 +718,7 @@ u8 *rtw_tdls_set_sup_ch(_adapter *adapter, u8 *pframe, struct pkt_attrib *pattri ch_set_idx++; } - return rtw_set_ie(pframe, _SUPPORTED_CH_IE_, sup_ch_idx, sup_ch, &(pattrib->pktlen)); + return rtw_set_ie(pframe, WLAN_EID_SUPPORTED_CHANNELS, sup_ch_idx, sup_ch, &(pattrib->pktlen)); } u8 *rtw_tdls_set_rsnie(struct tdls_txmgmt *ptxmgmt, u8 *pframe, struct pkt_attrib *pattrib, int init, struct sta_info *ptdls_sta) @@ -1914,7 +1914,7 @@ sint On_TDLS_Setup_Req(_adapter *padapter, union recv_frame *precv_frame, struct memcpy(supportRate, pIE->data, pIE->Length); supportRateNum = pIE->Length; break; - case _COUNTRY_IE_: + case WLAN_EID_COUNTRY: break; case WLAN_EID_EXT_SUPP_RATES: if (supportRateNum < sizeof(supportRate)) { @@ -1922,7 +1922,7 @@ sint On_TDLS_Setup_Req(_adapter *padapter, union recv_frame *precv_frame, struct supportRateNum += pIE->Length; } break; - case _SUPPORTED_CH_IE_: + case WLAN_EID_SUPPORTED_CHANNELS: break; case WLAN_EID_RSN: rsnie_included = 1; @@ -2096,7 +2096,7 @@ int On_TDLS_Setup_Rsp(_adapter *padapter, union recv_frame *precv_frame, struct memcpy(supportRate, pIE->data, pIE->Length); supportRateNum = pIE->Length; break; - case _COUNTRY_IE_: + case WLAN_EID_COUNTRY: break; case WLAN_EID_EXT_SUPP_RATES: if (supportRateNum < sizeof(supportRate)) { @@ -2104,7 +2104,7 @@ int On_TDLS_Setup_Rsp(_adapter *padapter, union recv_frame *precv_frame, struct supportRateNum += pIE->Length; } break; - case _SUPPORTED_CH_IE_: + case WLAN_EID_SUPPORTED_CHANNELS: break; case WLAN_EID_RSN: prsnie = (u8 *)pIE; diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index 61ec1c9..d5c98c8 100644 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -2732,7 +2732,7 @@ void process_csa_ie(_adapter *padapter, u8 *ies, uint ies_len) pIE = (PNDIS_802_11_VARIABLE_IEs)(ies + i); switch (pIE->ElementID) { - case _CH_SWTICH_ANNOUNCE_: + case WLAN_EID_CHANNEL_SWITCH: ch = *(pIE->data + 1); break; default: