staging: rtl8723bs: replace unique macros and WIFI_STATUS_CODE
PATCH 1/10 staging: rtl8723bs: replace unique macros and WIFI_STATUS_CODE
Replace many unique macros and WIFI_STATUS_CODE enum with kernel provided ieee80211_statuscode. A duplicate WLAN_STATUS_ASSOC_DENIED_NOSHORT macro is also removed.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 54 +++++++++---------- drivers/staging/rtl8723bs/include/ieee80211.h | 3 -- drivers/staging/rtl8723bs/include/wifi.h | 51 ------------------ 3 files changed, 27 insertions(+), 81 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +27 -27
@@ -940,13 +940,13 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)DBG_871X ("auth rejected due to bad alg [alg =%d, auth_mib =%d] %02X%02X%02X%02X%02X%02X\n" , algorithm, auth_mode, sa[0 ], sa[1 ], sa[2 ], sa[3 ], sa[4 ], sa[5 ]); - status = _STATS_NO_SUPP_ALG_; + status =WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG ; goto auth_fail; }if (rtw_access_ctrl (padapter, sa) == false) { - status = _STATS_UNABLE_HANDLE_STA_; + status =WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA ; goto auth_fail; }
@@ -958,7 +958,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) pstat =rtw_alloc_stainfo (pstapriv, sa);if (pstat ==NULL ) {DBG_871X (" Exceed the upper limit of supported clients...\n" ); - status = _STATS_UNABLE_HANDLE_STA_; + status =WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA ; goto auth_fail; }
@@ -999,7 +999,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)if ((pstat->auth_seq +1 ) != seq) {DBG_871X ("(1)auth rejected because out of seq [rx_seq =%d, exp_seq =%d]!\n" , seq, pstat->auth_seq+1 ); - status = _STATS_OUT_OF_AUTH_SEQ_; + status =WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION ; goto auth_fail; }
@@ -1012,7 +1012,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) }else {DBG_871X ("(2)auth rejected because out of seq [rx_seq =%d, exp_seq =%d]!\n" , seq, pstat->auth_seq+1 ); - status = _STATS_OUT_OF_AUTH_SEQ_; + status =WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION ; goto auth_fail; } }else {/* shared system or auto authentication */
@@ -1033,7 +1033,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)if ((p ==NULL ) || (ie_len <=0 )) {DBG_871X ("auth rejected because challenge failure!(1)\n" ); - status = _STATS_CHALLENGE_FAIL_; + status =WLAN_STATUS_CHALLENGE_FAIL ; goto auth_fail; }
@@ -1044,13 +1044,13 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) pstat->expire_to = pstapriv->assoc_to; }else {DBG_871X ("auth rejected because challenge failure!\n" ); - status = _STATS_CHALLENGE_FAIL_; + status =WLAN_STATUS_CHALLENGE_FAIL ; goto auth_fail; } }else {DBG_871X ("(3)auth rejected because out of seq [rx_seq =%d, exp_seq =%d]!\n" , seq, pstat->auth_seq+1 ); - status = _STATS_OUT_OF_AUTH_SEQ_; + status =WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION ; goto auth_fail; } }
@@ -1059,7 +1059,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)/* Now, we are going to issue_auth... */ pstat->auth_seq = seq +1 ; -issue_auth (padapter, pstat, (unsigned short )(_STATS_SUCCESSFUL_)); +issue_auth (padapter, pstat, (unsigned short )(WLAN_STATUS_SUCCESS ));if (pstat->state &WIFI_FW_AUTH_SUCCESS ) pstat->auth_seq =0 ;
@@ -1178,7 +1178,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)int i, ie_len, wpa_ie_len, left;unsigned char supportRate[16 ];int supportRateNum; -unsigned short status = _STATS_SUCCESSFUL_; +unsigned short status =WLAN_STATUS_SUCCESS ;unsigned short frame_type, ie_offset =0 ;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct security_priv *psecuritypriv = &padapter->securitypriv;
@@ -1245,7 +1245,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) !elems.ssid) {DBG_871X ("STA %pM sent invalid association request\n" ,MAC_ARG (pstat->hwaddr)); - status = _STATS_FAILURE_; + status =WLAN_STATUS_CHALLENGE_FAIL ; goto OnAssocReqFail; }
@@ -1256,18 +1256,18 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)if (!p || ie_len ==0 ) {/* broadcast ssid, however it is not allowed in assocreq */ - status = _STATS_FAILURE_; + status =WLAN_STATUS_CHALLENGE_FAIL ; goto OnAssocReqFail; }else {/* check if ssid match */ if (memcmp ((void *)(p+2 ), cur->Ssid.Ssid, cur->Ssid.SsidLength)) - status = _STATS_FAILURE_; + status =WLAN_STATUS_CHALLENGE_FAIL ;if (ie_len != cur->Ssid.SsidLength) - status = _STATS_FAILURE_; + status =WLAN_STATUS_CHALLENGE_FAIL ; } -if (status != _STATS_SUCCESSFUL_) +if (status !=WLAN_STATUS_SUCCESS ) goto OnAssocReqFail;/* check if the supported rate is ok */
@@ -1278,7 +1278,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)/* memcpy(supportRate, AP_BSSRATE, AP_BSSRATE_LEN); */ /* supportRateNum = AP_BSSRATE_LEN; */ - status = _STATS_FAILURE_; + status =WLAN_STATUS_CHALLENGE_FAIL ; goto OnAssocReqFail; }else {memcpy (supportRate, p+2 , ie_len);
@@ -1326,10 +1326,10 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) pstat->wpa2_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa2_pairwise_cipher;if (!pstat->wpa2_group_cipher) - status =WLAN_STATUS_GROUP_CIPHER_NOT_VALID ; + status =WLAN_STATUS_INVALID_GROUP_CIPHER ;if (!pstat->wpa2_pairwise_cipher) - status =WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID ; + status =WLAN_STATUS_INVALID_PAIRWISE_CIPHER ; }else { status =WLAN_STATUS_INVALID_IE ; }
@@ -1349,10 +1349,10 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) pstat->wpa_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa_pairwise_cipher;if (!pstat->wpa_group_cipher) - status =WLAN_STATUS_GROUP_CIPHER_NOT_VALID ; + status =WLAN_STATUS_INVALID_GROUP_CIPHER ;if (!pstat->wpa_pairwise_cipher) - status =WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID ; + status =WLAN_STATUS_INVALID_PAIRWISE_CIPHER ; }else { status =WLAN_STATUS_INVALID_IE ;
@@ -1363,7 +1363,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) wpa_ie_len =0 ; } -if (status != _STATS_SUCCESSFUL_) +if (status !=WLAN_STATUS_SUCCESS ) goto OnAssocReqFail; pstat->flags &= ~(WLAN_STA_WPS |WLAN_STA_MAYBE_WPS );
@@ -1396,7 +1396,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)if (!selected_registrar) {DBG_871X ("selected_registrar is false , or AP is not ready to do WPS\n" ); - status = _STATS_UNABLE_HANDLE_STA_; + status =WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA ; goto OnAssocReqFail; }
@@ -1507,7 +1507,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)if ((pmlmepriv->htpriv.ht_option == false) && (pstat->flags&WLAN_STA_HT )) { - status = _STATS_FAILURE_; + status =WLAN_STATUS_CHALLENGE_FAIL ; goto OnAssocReqFail; }
@@ -1517,7 +1517,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) (pstat->wpa_pairwise_cipher&WPA_CIPHER_TKIP))) {DBG_871X ("HT: %pM tried to use TKIP with HT association\n" ,MAC_ARG (pstat->hwaddr)); -/* status = WLAN_STATUS_CIPHER_REJECTED_PER_POLICY; */ +/* status = WLAN_STATUS_CIPHER_SUITE_REJECTED; */ /* goto OnAssocReqFail; */ } pstat->flags |=WLAN_STA_NONERP ;
@@ -1535,7 +1535,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) -if (status != _STATS_SUCCESSFUL_) +if (status !=WLAN_STATUS_SUCCESS ) goto OnAssocReqFail;/* TODO: identify_proprietary_vendor_ie(); */
@@ -1592,7 +1592,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)spin_unlock_bh (&pstapriv->asoc_list_lock);/* now the station is qualified to join our BSS... */ -if (pstat && (pstat->state &WIFI_FW_ASSOC_SUCCESS ) && (_STATS_SUCCESSFUL_ == status)) { +if (pstat && (pstat->state &WIFI_FW_ASSOC_SUCCESS ) && (WLAN_STATUS_SUCCESS == status)) {/* 1 bss_cap_update & sta_info_update */ bss_cap_update_on_sta_join (padapter, pstat);sta_info_update (padapter, pstat);
@@ -3004,7 +3004,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short/* setting auth algo number */ val16 = (u16 )psta->authalg; -if (status != _STATS_SUCCESSFUL_) +if (status !=WLAN_STATUS_SUCCESS ) val16 =0 ;if (val16)
drivers/staging/rtl8723bs/include/ieee80211.h +0 -3
@@ -347,9 +347,6 @@ struct ieee80211_snap_hdr {#define WLAN_CAPABILITY_BSS (1<<0)#define WLAN_CAPABILITY_SHORT_SLOT (1<<10) -/* 802.11b */ -#define WLAN_STATUS_ASSOC_DENIED_NOSHORT 19 -/* Reason codes */ #define WLAN_REASON_ACTIVE_ROAM 65533#define WLAN_REASON_JOIN_WRONG_CHANNEL 65534
drivers/staging/rtl8723bs/include/wifi.h +0 -51
57 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 2/10 staging: rtl8723bs: replace WIFI_REASON_CODE
Replace unique macros and WIFI_REASON_CODE enum with the kernel provided ieee80211_reasoncode.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 +-- drivers/staging/rtl8723bs/include/wifi.h | 36 ------------------- 2 files changed, 2 insertions(+), 38 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +2 -2
@@ -1210,7 +1210,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) pstat =rtw_get_stainfo (pstapriv,GetAddr2Ptr (pframe));if (!pstat) { - status = _RSON_CLS2_; + status =WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA ; goto asoc_class2_error; }
@@ -1226,7 +1226,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)/* check if this stat has been successfully authenticated/assocated */ if (!((pstat->state) &WIFI_FW_AUTH_SUCCESS )) {if (!((pstat->state) &WIFI_FW_ASSOC_SUCCESS )) { - status = _RSON_CLS2_; + status =WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA ; goto asoc_class2_error; }else { pstat->state &= (~WIFI_FW_ASSOC_SUCCESS );
drivers/staging/rtl8723bs/include/wifi.h +0 -36
@@ -88,42 +88,6 @@ enum WIFI_FRAME_SUBTYPE { WIFI_QOS_DATA_NULL = (BIT(6) | WIFI_QOS_DATA_TYPE), }; -enum WIFI_REASON_CODE { - _RSON_RESERVED_ =0 , - _RSON_UNSPECIFIED_ =1 , - _RSON_AUTH_NO_LONGER_VALID_ =2 , - _RSON_DEAUTH_STA_LEAVING_ =3 , - _RSON_INACTIVITY_ =4 , - _RSON_UNABLE_HANDLE_ =5 , - _RSON_CLS2_ =6 , - _RSON_CLS3_ =7 , - _RSON_DISAOC_STA_LEAVING_ =8 , - _RSON_ASOC_NOT_AUTH_ =9 , - -/* WPA reason */ - _RSON_INVALID_IE_ =13 , - _RSON_MIC_FAILURE_ =14 , - _RSON_4WAY_HNDSHK_TIMEOUT_ =15 , - _RSON_GROUP_KEY_UPDATE_TIMEOUT_ =16 , - _RSON_DIFF_IE_ =17 , - _RSON_MLTCST_CIPHER_NOT_VALID_ =18 , - _RSON_UNICST_CIPHER_NOT_VALID_ =19 , - _RSON_AKMP_NOT_VALID_ =20 , - _RSON_UNSUPPORT_RSNE_VER_ =21 , - _RSON_INVALID_RSNE_CAP_ =22 , - _RSON_IEEE_802DOT1X_AUTH_FAIL_ =23 , - -/* belowing are Realtek definition */ - _RSON_PMK_NOT_AVAILABLE_ =24 , - _RSON_TDLS_TEAR_TOOFAR_ =25 , - _RSON_TDLS_TEAR_UN_RSN_ =26 , -}; - -/* Reason codes (IEEE 802.11-2007, 7.3.1.7, Table 7-22) */ -/* IEEE 802.11h */ -#define WLAN_REASON_PWR_CAPABILITY_NOT_VALID 10 -#define WLAN_REASON_SUPPORTED_CHANNEL_NOT_VALID 11 -enum WIFI_REG_DOMAIN {DOMAIN_FCC =1 ,DOMAIN_IC =2 ,
Signature · 1 line
2.25.1
PATCH 3/10 staging: rtl8723bs: replace cap_* macros
In reply to Ross SchmidtReplace unique cap_* macros with kernel provided WLAN_CAPABILITY_* macros.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 2 +- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 6 +++--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 12 ++++++------ drivers/staging/rtl8723bs/include/ieee80211.h | 4 ---- drivers/staging/rtl8723bs/include/wifi.h | 12 ------------ drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 4 ++-- 7 files changed, 14 insertions(+), 30 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +1 -1
@@ -1980,7 +1980,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) } } -if (!(psta->capability &WLAN_CAPABILITY_SHORT_SLOT )) { +if (!(psta->capability &WLAN_CAPABILITY_SHORT_SLOT_TIME )) {if (!psta->no_short_slot_time_set) { psta->no_short_slot_time_set =1 ;
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +3 -3
@@ -314,13 +314,13 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)/* capability info */ *(u16 *)ie =0 ; - *(__le16 *)ie |=cpu_to_le16 (cap_IBSS); + *(__le16 *)ie |=cpu_to_le16 (WLAN_CAPABILITY_IBSS );if (pregistrypriv->preamble ==PREAMBLE_SHORT ) - *(__le16 *)ie |=cpu_to_le16 (cap_ShortPremble); + *(__le16 *)ie |=cpu_to_le16 (WLAN_CAPABILITY_SHORT_PREAMBLE );if (pdev_network->Privacy) - *(__le16 *)ie |=cpu_to_le16 (cap_Privacy); + *(__le16 *)ie |=cpu_to_le16 (WLAN_CAPABILITY_PRIVACY ); sz +=2 ; ie +=2 ;
drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -2
@@ -424,8 +424,8 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea ((!memcmp (src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength))) && ((s_cap &WLAN_CAPABILITY_IBSS ) == (d_cap &WLAN_CAPABILITY_IBSS )) && - ((s_cap &WLAN_CAPABILITY_BSS ) == - (d_cap &WLAN_CAPABILITY_BSS )); + ((s_cap &WLAN_CAPABILITY_ESS ) == + (d_cap &WLAN_CAPABILITY_ESS )); }
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +6 -6
@@ -4600,7 +4600,7 @@ void start_create_ibss(struct adapter *padapter)/* update capability */ caps =rtw_get_capability ((struct wlan_bssid_ex *)pnetwork);update_capinfo (padapter, caps); -if (caps&cap_IBSS) {/* adhoc master */ +if (caps&WLAN_CAPABILITY_IBSS ) {/* adhoc master */ val8 =0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8));
@@ -4655,7 +4655,7 @@ void start_clnt_join(struct adapter *padapter)/* update capability */ caps =rtw_get_capability ((struct wlan_bssid_ex *)pnetwork);update_capinfo (padapter, caps); -if (caps&cap_ESS) { +if (caps&WLAN_CAPABILITY_ESS ) {Set_MSR (padapter,WIFI_FW_STATION_STATE ); val8 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_8021X) ?0xcc :0xcf ;
@@ -4681,7 +4681,7 @@ void start_clnt_join(struct adapter *padapter) (REAUTH_TO * REAUTH_LIMIT) + (REASSOC_TO*REASSOC_LIMIT) + beacon_timeout); pmlmeinfo->state =WIFI_FW_AUTH_NULL |WIFI_FW_STATION_STATE ; - }else if (caps&cap_IBSS) {/* adhoc client */ + }else if (caps&WLAN_CAPABILITY_IBSS ) {/* adhoc client */ Set_MSR (padapter,WIFI_FW_ADHOC_STATE ); val8 =0xcf ;
@@ -5952,9 +5952,9 @@ static int rtw_auto_ap_start_beacon(struct adapter *adapter)/* capability info */ *(u16 *)ie =0 ; - *(u16 *)ie |=cpu_to_le16 (cap_ESS); - *(u16 *)ie |=cpu_to_le16 (cap_ShortPremble); -/* u16*)ie |= cpu_to_le16(cap_Privacy); */ + *(u16 *)ie |=cpu_to_le16 (WLAN_CAPABILITY_ESS ); + *(u16 *)ie |=cpu_to_le16 (WLAN_CAPABILITY_SHORT_PREAMBLE ); +/* u16*)ie |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY); */ sz +=2 ; ie +=2 ;
drivers/staging/rtl8723bs/include/ieee80211.h +0 -4
@@ -343,10 +343,6 @@ struct ieee80211_snap_hdr {#define WLAN_GET_SEQ_FRAG (seq) ((seq) & RTW_IEEE80211_SCTL_FRAG)#define WLAN_GET_SEQ_SEQ (seq) ((seq) & RTW_IEEE80211_SCTL_SEQ) -/* Authentication algorithms */ -#define WLAN_CAPABILITY_BSS (1<<0) -#define WLAN_CAPABILITY_SHORT_SLOT (1<<10) -/* Reason codes */ #define WLAN_REASON_ACTIVE_ROAM 65533#define WLAN_REASON_JOIN_WRONG_CHANNEL 65534
drivers/staging/rtl8723bs/include/wifi.h +0 -12
@@ -516,18 +516,6 @@ enum ELEMENT_ID {#define WLAN_ETHCONV_RFC1042 2#define WLAN_ETHCONV_8021h 3 -#define cap_ESS BIT(0) -#define cap_IBSS BIT(1) -#define cap_CFPollable BIT(2) -#define cap_CFRequest BIT(3) -#define cap_Privacy BIT(4) -#define cap_ShortPremble BIT(5) -#define cap_PBCC BIT(6) -#define cap_ChAgility BIT(7) -#define cap_SpecMgmt BIT(8) -#define cap_QoS BIT(9) -#define cap_ShortSlot BIT(10) -/*----------------------------------------------------------------------------- Below is the definition for 802.11i / 802.1x ------------------------------------------------------------------------------*/
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +2 -2
@@ -163,8 +163,8 @@ static char *translate_scan(struct adapter *padapter, cap =le16_to_cpu (le_tmp); } -if (cap & (WLAN_CAPABILITY_IBSS |WLAN_CAPABILITY_BSS )) { -if (cap &WLAN_CAPABILITY_BSS ) +if (cap & (WLAN_CAPABILITY_IBSS |WLAN_CAPABILITY_ESS )) { +if (cap &WLAN_CAPABILITY_ESS ) iwe.u.mode =IW_MODE_MASTER ;else iwe.u.mode =IW_MODE_ADHOC ;
Signature · 1 line
2.25.1
PATCH 4/10 staging: rtl8723bs: replace HT_CAP_AMPDU_FACTOR
In reply to Ross SchmidtReplace unique HT_CAP_AMPDU_FACTOR enum with kernel provided ieee80211_max_ampdu_length_exp enum.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 12 ++++++------ drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 +- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 2 +- drivers/staging/rtl8723bs/include/wifi.h | 7 ------- 5 files changed, 10 insertions(+), 17 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -2
@@ -2580,7 +2580,7 @@ void rtw_build_wmm_ie_ht(struct adapter *padapter, u8 *out_ie, uint *pout_len)unsigned int rtw_restructure_ht_ie (struct adapter *padapter,u8 *in_ie,u8 *out_ie,uint in_len,uint *pout_len,u8 channel) {u32 ielen, out_len; -enum HT_CAP_AMPDU_FACTOR max_rx_ampdu_factor; +enum ieee80211_max_ampdu_length_exp max_rx_ampdu_factor;unsigned char *p, *pframe;struct ieee80211_ht_cap ht_capie;u8 cbw40_enable =0 , stbc_rx_enable =0 , rf_type =0 , operation_bw =0 ;
@@ -2698,7 +2698,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_if (padapter->driver_rx_ampdu_factor !=0xFF ) max_rx_ampdu_factor = - (enum HT_CAP_AMPDU_FACTOR )padapter->driver_rx_ampdu_factor; + (enum ieee80211_max_ampdu_length_exp )padapter->driver_rx_ampdu_factor;else rtw_hal_get_def_var (padapter,HW_VAR_MAX_RX_AMPDU_FACTOR , &max_rx_ampdu_factor);
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +6 -6
@@ -3880,7 +3880,7 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned chu16 reason_code;u16 BA_timeout_value;u16 BA_starting_seqctrl =0 ; -enum HT_CAP_AMPDU_FACTOR max_rx_ampdu_factor; +enum ieee80211_max_ampdu_length_exp max_rx_ampdu_factor;struct xmit_frame *pmgntframe;struct pkt_attrib *pattrib;u8 *pframe;
@@ -3975,18 +3975,18 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&status), &(pattrib->pktlen));if (padapter->driver_rx_ampdu_factor !=0xFF ) max_rx_ampdu_factor = - (enum HT_CAP_AMPDU_FACTOR )padapter->driver_rx_ampdu_factor; + (enum ieee80211_max_ampdu_length_exp )padapter->driver_rx_ampdu_factor;else rtw_hal_get_def_var (padapter,HW_VAR_MAX_RX_AMPDU_FACTOR , &max_rx_ampdu_factor); -if (MAX_AMPDU_FACTOR_64K == max_rx_ampdu_factor) +if (IEEE80211_HT_MAX_AMPDU_64K == max_rx_ampdu_factor) BA_para_set = ((le16_to_cpu (pmlmeinfo->ADDBA_req.BA_para_set) &0x3f ) |0x1000 );/* 64 buffer size */ -else if (MAX_AMPDU_FACTOR_32K == max_rx_ampdu_factor) +else if (IEEE80211_HT_MAX_AMPDU_32K == max_rx_ampdu_factor) BA_para_set = ((le16_to_cpu (pmlmeinfo->ADDBA_req.BA_para_set) &0x3f ) |0x0800 );/* 32 buffer size */ -else if (MAX_AMPDU_FACTOR_16K == max_rx_ampdu_factor) +else if (IEEE80211_HT_MAX_AMPDU_16K == max_rx_ampdu_factor) BA_para_set = ((le16_to_cpu (pmlmeinfo->ADDBA_req.BA_para_set) &0x3f ) |0x0400 );/* 16 buffer size */ -else if (MAX_AMPDU_FACTOR_8K == max_rx_ampdu_factor) +else if (IEEE80211_HT_MAX_AMPDU_8K == max_rx_ampdu_factor) BA_para_set = ((le16_to_cpu (pmlmeinfo->ADDBA_req.BA_para_set) &0x3f ) |0x0200 );/* 8 buffer size */ else BA_para_set = ((le16_to_cpu (pmlmeinfo->ADDBA_req.BA_para_set) &0x3f ) |0x1000 );/* 64 buffer size */
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
@@ -4373,7 +4373,7 @@ u8 GetHalDefVar8723B(struct adapter *padapter, enum HAL_DEF_VARIABLE variable, v/* [email protected] suggests 16K can get stable performance */ /* The experiment was done on SDIO interface */ /* coding by Lucas@20130730 */ - *(u32 *)pval =MAX_AMPDU_FACTOR_16K ; + *(u32 *)pval =IEEE80211_HT_MAX_AMPDU_16K ;break ;case HAL_DEF_TX_LDPC :case HAL_DEF_RX_LDPC :
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1 -1
@@ -1802,7 +1802,7 @@ static u8 GetHalDefVar8723BSDIO(case HW_VAR_MAX_RX_AMPDU_FACTOR :/* [email protected] suggests 16K can get stable performance */ /* coding by Lucas@20130730 */ - *(u32 *)pValue =MAX_AMPDU_FACTOR_16K ; + *(u32 *)pValue =IEEE80211_HT_MAX_AMPDU_16K ;break ;default : bResult =GetHalDefVar8723B (Adapter, eVariable, pValue);
drivers/staging/rtl8723bs/include/wifi.h +0 -7
@@ -612,13 +612,6 @@ struct ADDBA_request {__le16 BA_starting_seqctrl; } __attribute__ ((packed)); -enum HT_CAP_AMPDU_FACTOR { -MAX_AMPDU_FACTOR_8K =0 , -MAX_AMPDU_FACTOR_16K =1 , -MAX_AMPDU_FACTOR_32K =2 , -MAX_AMPDU_FACTOR_64K =3 , -}; -/* 802.11n HT capabilities masks */ #define IEEE80211_HT_CAP_LDPC_CODING 0x0001#define IEEE80211_HT_CAP_SUP_WIDTH 0x0002
Signature · 1 line
2.25.1
PATCH 5/10 staging: rtl8723bs: replace OP_MODE_* and HT_INFO_OPERATION_MODE_* macros
In reply to Ross SchmidtReplace unique OP_MODE_* and HT_INFO_OPERATION_MODE_* macro families with kernel provided IEEE80211_HT_OP_MODE_* macros.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 30 ++++++++++++------------ drivers/staging/rtl8723bs/include/wifi.h | 13 ---------- 2 files changed, 15 insertions(+), 28 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +15 -15
@@ -1842,28 +1842,28 @@ static int rtw_ht_operation_update(struct adapter *padapter)DBG_871X ("%s current operation mode = 0x%X\n" , __func__, pmlmepriv->ht_op_mode); -if (!(pmlmepriv->ht_op_mode &HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT ) +if (!(pmlmepriv->ht_op_mode &IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT ) && pmlmepriv->num_sta_ht_no_gf) { pmlmepriv->ht_op_mode |= -HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT ; +IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT ; op_mode_changes++; }else if ((pmlmepriv->ht_op_mode & -HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT ) && +IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT ) && pmlmepriv->num_sta_ht_no_gf ==0 ) { pmlmepriv->ht_op_mode &= - ~HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT ; + ~IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT ; op_mode_changes++; } -if (!(pmlmepriv->ht_op_mode &HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT ) && +if (!(pmlmepriv->ht_op_mode &IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT ) && (pmlmepriv->num_sta_no_ht || pmlmepriv->olbc_ht)) { - pmlmepriv->ht_op_mode |=HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT ; + pmlmepriv->ht_op_mode |=IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT ; op_mode_changes++; }else if ((pmlmepriv->ht_op_mode & -HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT ) && +IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT ) && (pmlmepriv->num_sta_no_ht ==0 && !pmlmepriv->olbc_ht)) { pmlmepriv->ht_op_mode &= - ~HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT ; + ~IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT ; op_mode_changes++; }
@@ -1873,20 +1873,20 @@ static int rtw_ht_operation_update(struct adapter *padapter)*/ new_op_mode =0 ;if (pmlmepriv->num_sta_no_ht || - (pmlmepriv->ht_op_mode &HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT )) - new_op_mode =OP_MODE_MIXED ; + (pmlmepriv->ht_op_mode &IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT )) + new_op_mode =IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED ;else if ( (le16_to_cpu (phtpriv_ap->ht_cap.cap_info) &IEEE80211_HT_CAP_SUP_WIDTH ) && pmlmepriv->num_sta_ht_20mhz) - new_op_mode =OP_MODE_20MHZ_HT_STA_ASSOCED ; + new_op_mode =IEEE80211_HT_OP_MODE_PROTECTION_20MHZ ;else if (pmlmepriv->olbc_ht) - new_op_mode =OP_MODE_MAY_BE_LEGACY_STAS ; + new_op_mode =IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER ;else - new_op_mode =OP_MODE_PURE ; + new_op_mode =IEEE80211_HT_OP_MODE_PROTECTION_NONE ; - cur_op_mode = pmlmepriv->ht_op_mode &HT_INFO_OPERATION_MODE_OP_MODE_MASK ; + cur_op_mode = pmlmepriv->ht_op_mode &IEEE80211_HT_OP_MODE_PROTECTION ;if (cur_op_mode != new_op_mode) { - pmlmepriv->ht_op_mode &= ~HT_INFO_OPERATION_MODE_OP_MODE_MASK ; + pmlmepriv->ht_op_mode &= ~IEEE80211_HT_OP_MODE_PROTECTION ; pmlmepriv->ht_op_mode |= new_op_mode; op_mode_changes++; }
drivers/staging/rtl8723bs/include/wifi.h +0 -13
@@ -673,12 +673,6 @@ struct ADDBA_request {#define WLAN_HT_CAP_SM_PS_INVALID 2#define WLAN_HT_CAP_SM_PS_DISABLED 3 - -#define OP_MODE_PURE 0 -#define OP_MODE_MAY_BE_LEGACY_STAS 1 -#define OP_MODE_20MHZ_HT_STA_ASSOCED 2 -#define OP_MODE_MIXED 3 -#define HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK ((u8) BIT(0) | BIT(1))#define HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE ((u8) BIT(0))#define HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW ((u8) BIT(0) | BIT(1))
@@ -687,13 +681,6 @@ struct ADDBA_request {#define HT_INFO_HT_PARAM_CTRL_ACCESS_ONLY ((u8) BIT(4))#define HT_INFO_HT_PARAM_SRV_INTERVAL_GRANULARITY ((u8) BIT(5)) -#define HT_INFO_OPERATION_MODE_OP_MODE_MASK \ - ((u16) (0x0001 | 0x0002)) -#define HT_INFO_OPERATION_MODE_OP_MODE_OFFSET 0 -#define HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT ((u8) BIT(2)) -#define HT_INFO_OPERATION_MODE_TRANSMIT_BURST_LIMIT ((u8) BIT(3)) -#define HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT ((u8) BIT(4)) -#define HT_INFO_STBC_PARAM_DUAL_BEACON ((u16) BIT(6))#define HT_INFO_STBC_PARAM_DUAL_STBC_PROTECT ((u16) BIT(7))#define HT_INFO_STBC_PARAM_SECONDARY_BCN ((u16) BIT(8))
Signature · 1 line
2.25.1
PATCH 6/10 staging: rtl8723bs: remove WLAN_HT_CAP_SM_PS_* macros
In reply to Ross SchmidtThe WLAN_HT_CAP_SM_PS_* macro family is already defined in linux/ieee80211.h, remove them.
--- drivers/staging/rtl8723bs/include/wifi.h | 7 ------- 1 file changed, 7 deletions(-)
drivers/staging/rtl8723bs/include/wifi.h +0 -7
@@ -666,13 +666,6 @@ struct ADDBA_request {*/ #define IEEE80211_MIN_AMPDU_BUF 0x8 - -/* Spatial Multiplexing Power Save Modes */ -#define WLAN_HT_CAP_SM_PS_STATIC 0 -#define WLAN_HT_CAP_SM_PS_DYNAMIC 1 -#define WLAN_HT_CAP_SM_PS_INVALID 2 -#define WLAN_HT_CAP_SM_PS_DISABLED 3 -#define HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK ((u8) BIT(0) | BIT(1))#define HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE ((u8) BIT(0))#define HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW ((u8) BIT(0) | BIT(1))
Signature · 1 line
2.25.1
PATCH 7/10 staging: rtl8723bs: replace RTW_IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK
In reply to Ross SchmidtReplace unique macro RTW_IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK with kernel provided IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK. The other IEEE80211_ADDBA_* and IEEE_DELBA_* macros are duplicates already defined in linux/ieee80211.h, remove them.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 6 +++--- drivers/staging/rtl8723bs/include/wifi.h | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +3 -3
@@ -3943,7 +3943,7 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch/* TID */ BA_para_set |= (status <<2 ) &IEEE80211_ADDBA_PARAM_TID_MASK ;/* max buffer size is 8 MSDU */ - BA_para_set |= (8 <<6 ) &RTW_IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK ; + BA_para_set |= (8 <<6 ) &IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK ; }else { BA_para_set = (0x1002 | ((status &0xf ) <<2 ));/* immediate ack & 64 buffer size */ }
@@ -3994,8 +3994,8 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned chif (hal_btcoex_IsBTCoexCtrlAMPDUSize (padapter) && padapter->driver_rx_ampdu_factor ==0xFF ) {/* max buffer size is 8 MSDU */ - BA_para_set &= ~RTW_IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK ; - BA_para_set |= (8 <<6 ) &RTW_IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK ; + BA_para_set &= ~IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK ; + BA_para_set |= (8 <<6 ) &IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK ; }if (pregpriv->ampdu_amsdu ==0 )/* disabled */
drivers/staging/rtl8723bs/include/wifi.h +0 -7
@@ -653,13 +653,6 @@ struct ADDBA_request {#define IEEE80211_HT_IE_NON_GF_STA_PRSNT 0x0004#define IEEE80211_HT_IE_NON_HT_STA_PRSNT 0x0010 -/* block-ack parameters */ -#define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002 -#define IEEE80211_ADDBA_PARAM_TID_MASK 0x003C -#define RTW_IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFC0 -#define IEEE80211_DELBA_PARAM_TID_MASK 0xF000 -#define IEEE80211_DELBA_PARAM_INITIATOR_MASK 0x0800 -/* * A-PMDU buffer sizes * According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2)
Signature · 1 line
2.25.1
PATCH 8/10 staging: rtl8723bs: remove unused macros
In reply to Ross SchmidtRemove many macros from wifi.h because they are unused.
--- drivers/staging/rtl8723bs/include/wifi.h | 33 ------------------------ 1 file changed, 33 deletions(-)
drivers/staging/rtl8723bs/include/wifi.h +0 -33
@@ -643,39 +643,6 @@ struct ADDBA_request {#define IEEE80211_HT_CAP_TXBF_TX_NDP 0x00000010#define IEEE80211_HT_CAP_TXBF_EXPLICIT_COMP_STEERING_CAP 0x00000400 -/* 802.11n HT IE masks */ -#define IEEE80211_HT_IE_CHA_SEC_OFFSET 0x03 -#define IEEE80211_HT_IE_CHA_SEC_NONE 0x00 -#define IEEE80211_HT_IE_CHA_SEC_ABOVE 0x01 -#define IEEE80211_HT_IE_CHA_SEC_BELOW 0x03 -#define IEEE80211_HT_IE_CHA_WIDTH 0x04 -#define IEEE80211_HT_IE_HT_PROTECTION 0x0003 -#define IEEE80211_HT_IE_NON_GF_STA_PRSNT 0x0004 -#define IEEE80211_HT_IE_NON_HT_STA_PRSNT 0x0010 - -/* -* A-PMDU buffer sizes -* According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2) -*/ -#define IEEE80211_MIN_AMPDU_BUF 0x8 - -#define HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK ((u8) BIT(0) | BIT(1)) -#define HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE ((u8) BIT(0)) -#define HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW ((u8) BIT(0) | BIT(1)) -#define HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH ((u8) BIT(2)) -#define HT_INFO_HT_PARAM_RIFS_MODE ((u8) BIT(3)) -#define HT_INFO_HT_PARAM_CTRL_ACCESS_ONLY ((u8) BIT(4)) -#define HT_INFO_HT_PARAM_SRV_INTERVAL_GRANULARITY ((u8) BIT(5)) - -#define HT_INFO_STBC_PARAM_DUAL_BEACON ((u16) BIT(6)) -#define HT_INFO_STBC_PARAM_DUAL_STBC_PROTECT ((u16) BIT(7)) -#define HT_INFO_STBC_PARAM_SECONDARY_BCN ((u16) BIT(8)) -#define HT_INFO_STBC_PARAM_LSIG_TXOP_PROTECT_ALLOWED ((u16) BIT(9)) -#define HT_INFO_STBC_PARAM_PCO_ACTIVE ((u16) BIT(10)) -#define HT_INFO_STBC_PARAM_PCO_PHASE ((u16) BIT(11)) - - -/* endif */ /* ===============WPS Section =============== */
Signature · 1 line
2.25.1
PATCH 9/10 staging: rtl8723bs: remove LIST_CONTAINOR
In reply to Ross SchmidtRemove unnecessary macro for container_of and call it directly.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 16 +++++++------- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 18 +++++++-------- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 6 ++--- drivers/staging/rtl8723bs/core/rtw_recv.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 12 +++++----- drivers/staging/rtl8723bs/core/rtw_xmit.c | 22 +++++++++---------- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 6 ++--- .../rtl8723bs/include/osdep_service_linux.h | 4 ---- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 6 ++--- .../staging/rtl8723bs/os_dep/ioctl_linux.c | 10 ++++----- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 2 +- 12 files changed, 52 insertions(+), 56 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +8 -8
@@ -223,7 +223,7 @@ void expire_timeout_chk(struct adapter *padapter) }#endif while (phead != plist) { - psta = LIST_CONTAINOR(plist, struct sta_info, auth_list); + psta = container_of(plist, struct sta_info, auth_list); plist =get_next (plist);
@@ -268,7 +268,7 @@ void expire_timeout_chk(struct adapter *padapter) }#endif while (phead != plist) { - psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); + psta = container_of(plist, struct sta_info, asoc_list); plist =get_next (plist);#ifdef CONFIG_AUTO_AP_MODE if (psta->isrc)
@@ -1344,7 +1344,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr) plist =get_next (phead);while (phead != plist) { - paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list); + paclnode = container_of(plist, struct rtw_wlan_acl_node, list); plist =get_next (plist);if (!memcmp (paclnode->addr, addr,ETH_ALEN )) {
@@ -1405,7 +1405,7 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr) plist =get_next (phead);while (phead != plist) { - paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list); + paclnode = container_of(plist, struct rtw_wlan_acl_node, list); plist =get_next (plist); if (
@@ -1912,7 +1912,7 @@ void associated_clients_update(struct adapter *padapter, u8 updated)/* check asoc_queue */ while (phead != plist) { - psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); + psta = container_of(plist, struct sta_info, asoc_list); plist =get_next (plist);
@@ -2193,7 +2193,7 @@ void rtw_sta_flush(struct adapter *padapter)/* free sta asoc_queue */ while (phead != plist) { - psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); + psta = container_of(plist, struct sta_info, asoc_list); plist =get_next (plist);
@@ -2297,7 +2297,7 @@ void rtw_ap_restore_network(struct adapter *padapter)while (phead != plist) {int stainfo_offset; - psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); + psta = container_of(plist, struct sta_info, asoc_list); plist =get_next (plist); stainfo_offset =rtw_stainfo_offset (pstapriv, psta);
@@ -2402,7 +2402,7 @@ void stop_ap_mode(struct adapter *padapter) phead =get_list_head (pacl_node_q); plist =get_next (phead);while (phead != plist) { - paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list); + paclnode = container_of(plist, struct rtw_wlan_acl_node, list); plist =get_next (plist);if (paclnode->valid) {
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -1
@@ -287,7 +287,7 @@ struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue)if (list_empty (&(queue->queue))) obj =NULL ;else { - obj = LIST_CONTAINOR(get_next(&(queue->queue)), struct cmd_obj, list); + obj = container_of(get_next(&(queue->queue)), struct cmd_obj, list);list_del_init (&obj->list); }
drivers/staging/rtl8723bs/core/rtw_mlme.c +9 -9
@@ -131,7 +131,7 @@ struct wlan_network *_rtw_dequeue_network(struct __queue *queue)else { - pnetwork = LIST_CONTAINOR(get_next(&queue->queue), struct wlan_network, list); + pnetwork = container_of(get_next(&queue->queue), struct wlan_network, list);list_del_init (&(pnetwork->list)); }
@@ -156,7 +156,7 @@ struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv) } plist =get_next (&(free_queue->queue)); - pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); + pnetwork = container_of(plist, struct wlan_network, list);list_del_init (&pnetwork->list);
@@ -256,7 +256,7 @@ struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr) plist =get_next (phead);while (plist != phead) { - pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); + pnetwork = container_of(plist, struct wlan_network, list);if (!memcmp (addr, pnetwork->network.MacAddress,ETH_ALEN ))break ;
@@ -287,7 +287,7 @@ void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)while (phead != plist) { - pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); + pnetwork = container_of(plist, struct wlan_network, list); plist =get_next (plist);
@@ -438,7 +438,7 @@ struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue, struc plist =get_next (phead);while (plist != phead) { - found = LIST_CONTAINOR(plist, struct wlan_network, list); + found = container_of(plist, struct wlan_network, list);if (is_same_network (&network->network, &found->network,0 ))break ;
@@ -468,7 +468,7 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue)if (phead == plist)break ; - pwlan = LIST_CONTAINOR(plist, struct wlan_network, list); + pwlan = container_of(plist, struct wlan_network, list);if (!pwlan->fixed) {if (oldest ==NULL ||time_after (oldest->last_scanned, pwlan->last_scanned))
@@ -589,7 +589,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *tif (phead == plist)break ; - pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); + pnetwork = container_of(plist, struct wlan_network, list);rtw_bug_check (pnetwork, pnetwork, pnetwork, pnetwork);
@@ -1942,7 +1942,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme)while (phead != mlme->pscanned) { - pnetwork = LIST_CONTAINOR(mlme->pscanned, struct wlan_network, list); + pnetwork = container_of(mlme->pscanned, struct wlan_network, list);if (!pnetwork) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("%s return _FAIL:(pnetwork == NULL)\n" , __func__)); ret = _FAIL;
@@ -2072,7 +2072,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)while (phead != pmlmepriv->pscanned) { - pnetwork = LIST_CONTAINOR(pmlmepriv->pscanned, struct wlan_network, list); + pnetwork = container_of(pmlmepriv->pscanned, struct wlan_network, list);if (!pnetwork) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("%s return _FAIL:(pnetwork == NULL)\n" , __func__)); ret = _FAIL;
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +3 -3
@@ -4119,7 +4119,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)if (phead == plist)break ; - pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); + pnetwork = container_of(plist, struct wlan_network, list); plist =get_next (plist);
@@ -5601,7 +5601,7 @@ void _linked_info_dump(struct adapter *padapter) phead = &pstapriv->asoc_list; plist =get_next (phead);while (phead != plist) { - psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); + psta = container_of(plist, struct sta_info, asoc_list); plist =get_next (plist); DBG_871X("STA[%pM]:UndecoratedSmoothedPWDB:%d\n",
@@ -6693,7 +6693,7 @@ u8 chk_bmc_sleepq_hdl(struct adapter *padapter, unsigned char *pbuf) xmitframe_plist =get_next (xmitframe_phead);while (xmitframe_phead != xmitframe_plist) { - pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); + pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list); xmitframe_plist =get_next (xmitframe_plist);
drivers/staging/rtl8723bs/core/rtw_recv.c +2 -2
@@ -293,7 +293,7 @@ struct recv_buf *rtw_dequeue_recvbuf(struct __queue *queue) plist =get_next (phead); - precvbuf = LIST_CONTAINOR(plist, struct recv_buf, list); + precvbuf = container_of(plist, struct recv_buf, list);list_del_init (&precvbuf->list);
@@ -1137,7 +1137,7 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_ xmitframe_plist =get_next (xmitframe_phead);if (xmitframe_phead != xmitframe_plist) { - pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); + pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list); xmitframe_plist =get_next (xmitframe_plist);
drivers/staging/rtl8723bs/core/rtw_sta_mgt.c +6 -6
@@ -133,7 +133,7 @@ void kfree_all_stainfo(struct sta_priv *pstapriv) plist =get_next (phead);while (phead != plist) { - psta = LIST_CONTAINOR(plist, struct sta_info, list); + psta = container_of(plist, struct sta_info, list); plist =get_next (plist); }
@@ -163,7 +163,7 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)while (phead != plist) {int i; - psta = LIST_CONTAINOR(plist, struct sta_info, hash_list); + psta = container_of(plist, struct sta_info, hash_list); plist =get_next (plist);for (i =0 ; i <16 ; i++) {
@@ -202,7 +202,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)spin_unlock_bh (&(pstapriv->sta_hash_lock));return NULL ; }else { - psta = LIST_CONTAINOR(get_next(&pfree_sta_queue->queue), struct sta_info, list); + psta = container_of(get_next(&pfree_sta_queue->queue), struct sta_info, list);list_del_init (&(psta->list));
@@ -479,7 +479,7 @@ void rtw_free_all_stainfo(struct adapter *padapter) plist =get_next (phead);while (phead != plist) { - psta = LIST_CONTAINOR(plist, struct sta_info, hash_list); + psta = container_of(plist, struct sta_info, hash_list); plist =get_next (plist);
@@ -516,7 +516,7 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) plist =get_next (phead);while (phead != plist) { - psta = LIST_CONTAINOR(plist, struct sta_info, hash_list); + psta = container_of(plist, struct sta_info, hash_list);if ((!memcmp (psta->hwaddr, addr,ETH_ALEN )))/* if found the matched address */
@@ -576,7 +576,7 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr) phead =get_list_head (pacl_node_q); plist =get_next (phead);while (phead != plist) { - paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list); + paclnode = container_of(plist, struct rtw_wlan_acl_node, list); plist =get_next (plist);if (!memcmp (paclnode->addr, mac_addr,ETH_ALEN ))
drivers/staging/rtl8723bs/core/rtw_xmit.c +11 -11
@@ -1565,7 +1565,7 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv) plist =get_next (phead); - pxmitbuf = LIST_CONTAINOR(plist, struct xmit_buf, list); + pxmitbuf = container_of(plist, struct xmit_buf, list);list_del_init (&pxmitbuf->list); }
@@ -1632,7 +1632,7 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv) plist =get_next (phead); - pxmitbuf = LIST_CONTAINOR(plist, struct xmit_buf, list); + pxmitbuf = container_of(plist, struct xmit_buf, list);list_del_init (&pxmitbuf->list); }
@@ -1747,7 +1747,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf plist =get_next (phead); - pxframe = LIST_CONTAINOR(plist, struct xmit_frame, list); + pxframe = container_of(plist, struct xmit_frame, list);list_del_init (&pxframe->list); pxmitpriv->free_xmitframe_cnt--;
@@ -1774,7 +1774,7 @@ struct xmit_frame *rtw_alloc_xmitframe_ext(struct xmit_priv *pxmitpriv) }else { phead =get_list_head (queue); plist =get_next (phead); - pxframe = LIST_CONTAINOR(plist, struct xmit_frame, list); + pxframe = container_of(plist, struct xmit_frame, list);list_del_init (&pxframe->list); pxmitpriv->free_xframe_ext_cnt--;
@@ -1881,7 +1881,7 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pfram plist =get_next (phead);while (phead != plist) { - pxmitframe = LIST_CONTAINOR(plist, struct xmit_frame, list); + pxmitframe = container_of(plist, struct xmit_frame, list); plist =get_next (plist);
@@ -2336,7 +2336,7 @@ static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struc plist =get_next (phead);while (phead != plist) { - pxmitframe = LIST_CONTAINOR(plist, struct xmit_frame, list); + pxmitframe = container_of(plist, struct xmit_frame, list); plist =get_next (plist);
@@ -2411,7 +2411,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) xmitframe_plist =get_next (xmitframe_phead);while (xmitframe_phead != xmitframe_plist) { - pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); + pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list); xmitframe_plist =get_next (xmitframe_plist);
@@ -2486,7 +2486,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) xmitframe_plist =get_next (xmitframe_phead);while (xmitframe_phead != xmitframe_plist) { - pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); + pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list); xmitframe_plist =get_next (xmitframe_plist);
@@ -2533,7 +2533,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst xmitframe_plist =get_next (xmitframe_phead);while (xmitframe_phead != xmitframe_plist) { - pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); + pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list); xmitframe_plist =get_next (xmitframe_plist);
@@ -2628,7 +2628,7 @@ struct xmit_buf *dequeue_pending_xmitbuf(struct xmit_priv *pxmitpriv) phead =get_list_head (pqueue); plist =get_next (phead); - pxmitbuf = LIST_CONTAINOR(plist, struct xmit_buf, list); + pxmitbuf = container_of(plist, struct xmit_buf, list);list_del_init (&pxmitbuf->list); }
@@ -2658,7 +2658,7 @@ struct xmit_buf *dequeue_pending_xmitbuf_under_survey(struct xmit_priv *pxmitpriif (plist == phead)break ; - pxmitbuf = LIST_CONTAINOR(plist, struct xmit_buf, list); + pxmitbuf = container_of(plist, struct xmit_buf, list); type =GetFrameSubType (pxmitbuf->pbuf +TXDESC_OFFSET );
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +3 -3
@@ -253,7 +253,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv/* because stop_sta_xmit may delete sta_plist at any time */ /* so we should add lock here, or while loop can not exit */ while (sta_phead != sta_plist) { - ptxservq = LIST_CONTAINOR(sta_plist, struct tx_servq, tx_pending); + ptxservq = container_of(sta_plist, struct tx_servq, tx_pending); sta_plist =get_next (sta_plist);#ifdef DBG_XMIT_BUF
@@ -278,7 +278,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitprivwhile (list_empty (frame_phead) == false) { frame_plist =get_next (frame_phead); - pxmitframe = LIST_CONTAINOR(frame_plist, struct xmit_frame, list); + pxmitframe = container_of(frame_plist, struct xmit_frame, list);/* check xmit_buf size enough or not */ txlen = txdesc_size +rtw_wlan_pkt_size (pxmitframe);
@@ -661,7 +661,7 @@ void rtl8723bs_free_xmit_priv(struct adapter *padapter) plist =get_next (phead);list_del_init (plist); - pxmitbuf = LIST_CONTAINOR(plist, struct xmit_buf, list); + pxmitbuf = container_of(plist, struct xmit_buf, list);rtw_free_xmitframe (pxmitpriv, (struct xmit_frame *)pxmitbuf->priv_data); pxmitbuf->priv_data =NULL ;rtw_free_xmitbuf (pxmitpriv, pxmitbuf);
drivers/staging/rtl8723bs/include/osdep_service_linux.h +0 -4
@@ -74,10 +74,6 @@ static inline struct list_head *get_list_head(struct __queue *queue)return (&(queue->queue)); } - -#define LIST_CONTAINOR (ptr, type, member) \ - container_of(ptr, type, member) -static inline void _set_timer (_timer *ptimer,u32 delay_time) {mod_timer (ptimer, (jiffies + (delay_time *HZ /1000 )));
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +3 -3
@@ -1418,7 +1418,7 @@ void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter)if (phead == plist)break ; - pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); + pnetwork = container_of(plist, struct wlan_network, list);/* report network only if the current channel set contains the channel to which this network belongs */ if (rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, pnetwork->network.Configuration.DSConfig) >= 0
@@ -2816,7 +2816,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev/* check asoc_queue */ while (phead != plist) { - psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); + psta = container_of(plist, struct sta_info, asoc_list); plist =get_next (plist);
@@ -2871,7 +2871,7 @@ static struct sta_info *rtw_sta_info_get_by_idx(const int idx, struct sta_priv */* check asoc_queue */ while (phead != plist) {if (idx == i) - psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); + psta = container_of(plist, struct sta_info, asoc_list); plist =get_next (plist); i++; }
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +5 -5
@@ -1160,7 +1160,7 @@ static int rtw_wx_set_wap(struct net_device *dev,if (phead == pmlmepriv->pscanned)break ; - pnetwork = LIST_CONTAINOR(pmlmepriv->pscanned, struct wlan_network, list); + pnetwork = container_of(pmlmepriv->pscanned, struct wlan_network, list); pmlmepriv->pscanned =get_next (pmlmepriv->pscanned);
@@ -1455,7 +1455,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,break ; } - pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); + pnetwork = container_of(plist, struct wlan_network, list);/* report network only if the current channel set contains the channel to which this network belongs */ if (rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, pnetwork->network.Configuration.DSConfig) >= 0
@@ -1558,7 +1558,7 @@ static int rtw_wx_set_essid(struct net_device *dev,break ; } - pnetwork = LIST_CONTAINOR(pmlmepriv->pscanned, struct wlan_network, list); + pnetwork = container_of(pmlmepriv->pscanned, struct wlan_network, list); pmlmepriv->pscanned =get_next (pmlmepriv->pscanned);
@@ -2478,7 +2478,7 @@ static int rtw_get_ap_info(struct net_device *dev,break ; - pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); + pnetwork = container_of(plist, struct wlan_network, list);if (!mac_pton (data, bssid)) {DBG_871X ("Invalid BSSID '%s'.\n" , (u8 *)data);
@@ -2851,7 +2851,7 @@ static int rtw_dbg_port(struct net_device *dev, plist =get_next (phead);while (phead != plist) { - psta = LIST_CONTAINOR(plist, struct sta_info, hash_list); + psta = container_of(plist, struct sta_info, hash_list); plist =get_next (plist);
drivers/staging/rtl8723bs/os_dep/xmit_linux.c +1 -1
@@ -148,7 +148,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)/* free sta asoc_queue */ while (phead != plist) {int stainfo_offset; - psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); + psta = container_of(plist, struct sta_info, asoc_list); plist =get_next (plist); stainfo_offset =rtw_stainfo_offset (pstapriv, psta);
Signature · 1 line
2.25.1
PATCH 10/10 staging: rtl8723bs: replace unique macros and ELEMENT_ID
In reply to Ross SchmidtReplace unique macros and ELEMENT_ID with kernel provided ieee80211_eid enum.
In a several cases multiple macros or constants are replaced by one constant.
WLAN_EID_HT_CAP, _HT_CAPABILITY_IE_, and EID_HTCapability are replace by WLAN_EID_HT_CAPABILITY.
_WPA2_IE_ID_, EID_WPA2, and _RSN_IE_2_ are replaced by WLAN_EID_RSN.
_HT_EXTRA_INFO_IE_ and _HT_ADD_INFO_IE_ are replaced by WLAN_EID_HT_OPERATION.
WLAN_EID_GENERIC, _WPA_IE_ID_, _SSN_IE_1_, and _VENDOR_SPECIFIC_IE_ are replaced by WLAN_EID_VENDOR_SPECIFIC.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 62 ++++---- drivers/staging/rtl8723bs/core/rtw_cmd.c | 4 +- .../staging/rtl8723bs/core/rtw_ieee80211.c | 44 +++--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 26 ++-- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 146 +++++++++--------- drivers/staging/rtl8723bs/core/rtw_recv.c | 4 +- drivers/staging/rtl8723bs/core/rtw_security.c | 2 +- .../staging/rtl8723bs/core/rtw_wlan_util.c | 26 ++-- drivers/staging/rtl8723bs/core/rtw_xmit.c | 12 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 20 +-- drivers/staging/rtl8723bs/include/ieee80211.h | 8 - .../staging/rtl8723bs/include/rtw_security.h | 3 - drivers/staging/rtl8723bs/include/wifi.h | 108 ------------- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 +- .../staging/rtl8723bs/os_dep/ioctl_linux.c | 14 +- drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 2 +- 16 files changed, 183 insertions(+), 302 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +31 -31
@@ -76,7 +76,7 @@ static void update_BCNTIM(struct adapter *padapter) p =rtw_get_ie ( pie + _FIXED_IE_LENGTH_, - _TIM_IE_, +WLAN_EID_TIM , &tim_ielen, pnetwork_mlmeext->IELength - _FIXED_IE_LENGTH_ );
@@ -100,7 +100,7 @@ static void update_BCNTIM(struct adapter *padapter)/* get ssid_ie len */ p =rtw_get_ie ( pie + _BEACON_IE_OFFSET_, - _SSID_IE_, +WLAN_EID_SSID , &tmp_len, (pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_) );
@@ -110,7 +110,7 @@ static void update_BCNTIM(struct adapter *padapter)/* get supported rates len */ p =rtw_get_ie ( pie + _BEACON_IE_OFFSET_, - _SUPPORTEDRATES_IE_, &tmp_len, +WLAN_EID_SUPP_RATES , &tmp_len, (pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_) );if (p)
@@ -133,7 +133,7 @@ static void update_BCNTIM(struct adapter *padapter)memcpy (pbackup_remainder_ie, premainder_ie, remainder_ielen); } - *dst_ie++ = _TIM_IE_; + *dst_ie++ =WLAN_EID_TIM ;if ((pstapriv->tim_bitmap &0xff00 ) && (pstapriv->tim_bitmap &0x00fe )) tim_ielen =5 ;
@@ -301,7 +301,7 @@ void expire_timeout_chk(struct adapter *padapter)/* to update bcn with tim_bitmap for this station */ pstapriv->tim_bitmap |=BIT (psta->aid); -update_beacon (padapter, _TIM_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_TIM ,NULL , true);if (!pmlmeext->active_keep_alive_check)continue ;
@@ -855,7 +855,7 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf)/* set channel, bwmode */ p =rtw_get_ie ( (pnetwork->IEs +sizeof (struct ndis_802_11_fix_ie )), - _HT_ADD_INFO_IE_, +WLAN_EID_HT_OPERATION , &ie_len, (pnetwork->IELength -sizeof (struct ndis_802_11_fix_ie )) );
@@ -922,7 +922,7 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf) );if (pmlmeext->bstart_bss) { -update_beacon (padapter, _TIM_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_TIM ,NULL , true);#ifndef CONFIG_INTERRUPT_BASED_TXBCN /* other case will tx beacon when bcn interrupt coming in. */ /* issue beacon frame */
@@ -1004,7 +1004,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)/* SSID */ p =rtw_get_ie ( ie + _BEACON_IE_OFFSET_, - _SSID_IE_, +WLAN_EID_SSID , &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_) );
@@ -1019,7 +1019,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) pbss_network->Configuration.Length =0 ; p =rtw_get_ie ( ie + _BEACON_IE_OFFSET_, - _DSSET_IE_, &ie_len, +WLAN_EID_DS_PARAMS , &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_) );if (p && ie_len >0 )
@@ -1031,7 +1031,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)/* get supported rates */ p =rtw_get_ie ( ie + _BEACON_IE_OFFSET_, - _SUPPORTEDRATES_IE_, +WLAN_EID_SUPP_RATES , &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_) );
@@ -1043,7 +1043,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)/* get ext_supported rates */ p =rtw_get_ie ( ie + _BEACON_IE_OFFSET_, - _EXT_SUPPORTEDRATES_IE_, +WLAN_EID_EXT_SUPP_RATES , &ie_len, pbss_network->IELength - _BEACON_IE_OFFSET_ );
@@ -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_) );
@@ -1080,7 +1080,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) psecuritypriv->wpa2_pairwise_cipher = _NO_PRIVACY_; p =rtw_get_ie ( ie + _BEACON_IE_OFFSET_, - _RSN_IE_2_, +WLAN_EID_RSN , &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_) );
@@ -1110,7 +1110,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)for (p = ie + _BEACON_IE_OFFSET_; ; p += (ie_len +2 )) { p =rtw_get_ie ( p, - _SSN_IE_1_, +WLAN_EID_VENDOR_SPECIFIC , &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_ - (ie_len +2 )) );
@@ -1146,7 +1146,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)for (p = ie + _BEACON_IE_OFFSET_; ; p += (ie_len +2 )) { p =rtw_get_ie ( p, - _VENDOR_SPECIFIC_IE_, +WLAN_EID_VENDOR_SPECIFIC , &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_ - (ie_len +2 )) );
@@ -1172,7 +1172,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)/* parsing HT_CAP_IE */ p =rtw_get_ie ( ie + _BEACON_IE_OFFSET_, - _HT_CAPABILITY_IE_, +WLAN_EID_HT_CAPABILITY , &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_) );
@@ -1235,7 +1235,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)/* parsing HT_INFO_IE */ p =rtw_get_ie ( ie + _BEACON_IE_OFFSET_, - _HT_ADD_INFO_IE_, +WLAN_EID_HT_OPERATION , &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_) );
@@ -1762,37 +1762,37 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)break ; -case _TIM_IE_: +case WLAN_EID_TIM :update_BCNTIM (padapter);break ; -case _ERPINFO_IE_: +case WLAN_EID_ERP_INFO :update_bcn_erpinfo_ie (padapter);break ; -case _HT_CAPABILITY_IE_: +case WLAN_EID_HT_CAPABILITY :update_bcn_htcap_ie (padapter);break ; -case _RSN_IE_2_: +case WLAN_EID_RSN :update_bcn_rsn_ie (padapter);break ; -case _HT_ADD_INFO_IE_: +case WLAN_EID_HT_OPERATION :update_bcn_htinfo_ie (padapter);break ; -case _VENDOR_SPECIFIC_IE_: +case WLAN_EID_VENDOR_SPECIFIC :update_bcn_vendor_spec_ie (padapter, oui);
@@ -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); } } }
@@ -2052,8 +2052,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) }if (rtw_ht_operation_update (padapter) >0 ) { -update_beacon (padapter, _HT_CAPABILITY_IE_,NULL , false); -update_beacon (padapter, _HT_ADD_INFO_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_HT_CAPABILITY ,NULL , false); +update_beacon (padapter,WLAN_EID_HT_OPERATION ,NULL , true); }/* update associated stations cap. */
@@ -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); } }
@@ -2116,8 +2116,8 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) }if (rtw_ht_operation_update (padapter) >0 ) { -update_beacon (padapter, _HT_CAPABILITY_IE_,NULL , false); -update_beacon (padapter, _HT_ADD_INFO_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_HT_CAPABILITY ,NULL , false); +update_beacon (padapter,WLAN_EID_HT_OPERATION ,NULL , true); }/* update associated stations cap. */
drivers/staging/rtl8723bs/core/rtw_cmd.c +2 -2
@@ -842,7 +842,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) } phtpriv->ht_option = false; - ptmp =rtw_get_ie (&pnetwork->network.IEs[12 ], _HT_CAPABILITY_IE_, &tmp_len, pnetwork->network.IELength-12 ); + ptmp =rtw_get_ie (&pnetwork->network.IEs[12 ],WLAN_EID_HT_CAPABILITY , &tmp_len, pnetwork->network.IELength-12 );if (pregistrypriv->ht_enable && ptmp && tmp_len >0 ) {/* Added by Albert 2010/06/23 */ /* For the WEP mode, we will use the bg mode to do the connection to avoid some IOT issue. */
@@ -1703,7 +1703,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter) pstapriv->sta_dz_bitmap &= ~BIT (0 );if (update_tim) -update_beacon (padapter, _TIM_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_TIM ,NULL , true); }else {/* re check again */ rtw_chk_hi_queue_cmd (padapter); }
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +22 -22
149 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_mlme.c +13 -13
@@ -736,7 +736,7 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor bselected = false;if (psecuritypriv->ndisauthtype == Ndis802_11AuthModeWPA2PSK) { - p =rtw_get_ie (pnetwork->network.IEs + _BEACON_IE_OFFSET_, _RSN_IE_2_, &ie_len, (pnetwork->network.IELength - _BEACON_IE_OFFSET_)); + p =rtw_get_ie (pnetwork->network.IEs + _BEACON_IE_OFFSET_,WLAN_EID_RSN , &ie_len, (pnetwork->network.IELength - _BEACON_IE_OFFSET_));if (p && ie_len >0 ) bselected = true;else
@@ -2354,15 +2354,15 @@ sint rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint inmemcpy (out_ie, in_ie,12 ); ielength =12 ;if ((ndisauthmode == Ndis802_11AuthModeWPA) || (ndisauthmode == Ndis802_11AuthModeWPAPSK)) - authmode = _WPA_IE_ID_; + authmode =WLAN_EID_VENDOR_SPECIFIC ;if ((ndisauthmode == Ndis802_11AuthModeWPA2) || (ndisauthmode == Ndis802_11AuthModeWPA2PSK)) - authmode = _WPA2_IE_ID_; + authmode =WLAN_EID_RSN ;if (check_fwstate (pmlmepriv,WIFI_UNDER_WPS )) {memcpy (out_ie+ielength, psecuritypriv->wps_ie, psecuritypriv->wps_ie_len); ielength += psecuritypriv->wps_ie_len; - }else if ((authmode == _WPA_IE_ID_) || (authmode == _WPA2_IE_ID_)) { + }else if ((authmode ==WLAN_EID_VENDOR_SPECIFIC ) || (authmode ==WLAN_EID_RSN )) {/* copy RSN or SSN */ memcpy (&out_ie[ielength], &psecuritypriv->supplicant_ie[0 ], psecuritypriv->supplicant_ie[1 ]+2 );/* debug for CONFIG_IEEE80211W
@@ -2381,7 +2381,7 @@ sint rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint inif (iEntry <0 ) {return ielength; }else { -if (authmode == _WPA2_IE_ID_) +if (authmode ==WLAN_EID_RSN ) ielength =rtw_append_pmkid (adapter, iEntry, out_ie, ielength); }return ielength;
@@ -2569,7 +2569,7 @@ void rtw_build_wmm_ie_ht(struct adapter *padapter, u8 *out_ie, uint *pout_len)if (padapter->mlmepriv.qospriv.qos_option ==0 ) { out_len = *pout_len; - pframe =rtw_set_ie (out_ie+out_len, _VENDOR_SPECIFIC_IE_, + pframe =rtw_set_ie (out_ie+out_len,WLAN_EID_VENDOR_SPECIFIC , _WMM_IE_Length_,WMM_IE , pout_len); padapter->mlmepriv.qospriv.qos_option =1 ;
@@ -2611,7 +2611,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_/* TDLS: TODO 40? */ operation_bw =CHANNEL_WIDTH_40 ; }else { - p =rtw_get_ie (in_ie, _HT_ADD_INFO_IE_, &ielen, in_len); + p =rtw_get_ie (in_ie,WLAN_EID_HT_OPERATION , &ielen, in_len);if (p && (ielen ==sizeof (struct ieee80211_ht_addt_info ))) {struct HT_info_element *pht_info = (struct HT_info_element *)(p+2 );if (pht_info->infos[0 ] &BIT (2 )) {
@@ -2711,16 +2711,16 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_else ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY &0x00 ); - pframe =rtw_set_ie (out_ie+out_len, _HT_CAPABILITY_IE_, + pframe =rtw_set_ie (out_ie+out_len,WLAN_EID_HT_CAPABILITY ,sizeof (struct ieee80211_ht_cap ), (unsigned char *)&ht_capie, pout_len); phtpriv->ht_option = true;if (in_ie) { - p =rtw_get_ie (in_ie, _HT_ADD_INFO_IE_, &ielen, in_len); + p =rtw_get_ie (in_ie,WLAN_EID_HT_OPERATION , &ielen, in_len);if (p && (ielen ==sizeof (struct ieee80211_ht_addt_info ))) { out_len = *pout_len; - pframe =rtw_set_ie (out_ie+out_len, _HT_ADD_INFO_IE_, ielen, p+2 , pout_len); + pframe =rtw_set_ie (out_ie+out_len,WLAN_EID_HT_OPERATION , ielen, p+2 , pout_len); } }
@@ -2761,7 +2761,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe/* check Max Rx A-MPDU Size */ len =0 ; - p =rtw_get_ie (pie+sizeof (struct ndis_802_11_fix_ie ), _HT_CAPABILITY_IE_, &len, ie_len-sizeof (struct ndis_802_11_fix_ie )); + p =rtw_get_ie (pie+sizeof (struct ndis_802_11_fix_ie ),WLAN_EID_HT_CAPABILITY , &len, ie_len-sizeof (struct ndis_802_11_fix_ie ));if (p && len >0 ) { pht_capie = (struct ieee80211_ht_cap *)(p+2 ); max_ampdu_sz = (pht_capie->ampdu_params_info &IEEE80211_HT_CAP_AMPDU_FACTOR );
@@ -2773,7 +2773,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe } len =0 ; - p =rtw_get_ie (pie+sizeof (struct ndis_802_11_fix_ie ), _HT_ADD_INFO_IE_, &len, ie_len-sizeof (struct ndis_802_11_fix_ie )); + p =rtw_get_ie (pie+sizeof (struct ndis_802_11_fix_ie ),WLAN_EID_HT_OPERATION , &len, ie_len-sizeof (struct ndis_802_11_fix_ie ));if (p && len >0 ) { pht_addtinfo = (struct ieee80211_ht_addt_info *)(p+2 );/* todo: */
@@ -2905,7 +2905,7 @@ void rtw_append_exented_cap(struct adapter *padapter, u8 *out_ie, uint *pout_lenif (phtpriv->bss_coexist)SET_EXT_CAPABILITY_ELE_BSS_COEXIST (cap_content,1 ); -rtw_set_ie (out_ie + *pout_len, EID_EXTCapability,8 , cap_content, pout_len); +rtw_set_ie (out_ie + *pout_len,WLAN_EID_EXT_CAPABILITY ,8 , cap_content, pout_len); }inline void rtw_set_to_roam (struct adapter *adapter,u8 to_roam)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +73 -73
472 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_recv.c +2 -2
@@ -1163,7 +1163,7 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_/* update BCN for TIM IE */ /* update_BCNTIM(padapter); */ -update_beacon (padapter, _TIM_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_TIM ,NULL , true); }/* spin_unlock_bh(&psta->sleep_q.lock); */
@@ -1189,7 +1189,7 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_/* update BCN for TIM IE */ /* update_BCNTIM(padapter); */ -update_beacon (padapter, _TIM_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_TIM ,NULL , true); } } }
drivers/staging/rtl8723bs/core/rtw_security.c +1 -1
@@ -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_wlan_util.c +13 -13
@@ -1289,7 +1289,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)/* check bw and channel offset */ /* parsing HT_CAP_IE */ - p =rtw_get_ie (bssid->IEs + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_); + p =rtw_get_ie (bssid->IEs + _FIXED_IE_LENGTH_,WLAN_EID_HT_CAPABILITY , &len, bssid->IELength - _FIXED_IE_LENGTH_);if (p && len >0 ) { pht_cap = (struct ieee80211_ht_cap *)(p +2 ); ht_cap_info =le16_to_cpu (pht_cap->cap_info);
@@ -1297,7 +1297,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) ht_cap_info =0 ; }/* parsing HT_INFO_IE */ - p =rtw_get_ie (bssid->IEs + _FIXED_IE_LENGTH_, _HT_ADD_INFO_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_); + p =rtw_get_ie (bssid->IEs + _FIXED_IE_LENGTH_,WLAN_EID_HT_OPERATION , &len, bssid->IELength - _FIXED_IE_LENGTH_);if (p && len >0 ) { pht_info = (struct HT_info_element *)(p +2 ); ht_info_infos_0 = pht_info->infos[0 ];
@@ -1321,11 +1321,11 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) }/* Checking for channel */ - p =rtw_get_ie (bssid->IEs + _FIXED_IE_LENGTH_, _DSSET_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_); + p =rtw_get_ie (bssid->IEs + _FIXED_IE_LENGTH_,WLAN_EID_DS_PARAMS , &len, bssid->IELength - _FIXED_IE_LENGTH_);if (p) { bcn_channel = *(p +2 ); }else {/* In 5G, some ap do not have DSSET IE checking HT info for channel */ -rtw_get_ie (bssid->IEs + _FIXED_IE_LENGTH_, _HT_ADD_INFO_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_); +rtw_get_ie (bssid->IEs + _FIXED_IE_LENGTH_,WLAN_EID_HT_OPERATION , &len, bssid->IELength - _FIXED_IE_LENGTH_);if (pht_info) { bcn_channel = pht_info->primary_channel; }else {/* we don't find channel IE, so don't check it */
@@ -1341,7 +1341,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)/* checking SSID */ ssid_len =0 ; - p =rtw_get_ie (bssid->IEs + _FIXED_IE_LENGTH_, _SSID_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_); + p =rtw_get_ie (bssid->IEs + _FIXED_IE_LENGTH_,WLAN_EID_SSID , &len, bssid->IELength - _FIXED_IE_LENGTH_);if (p) { ssid_len = *(p +1 );if (ssid_len >NDIS_802_11_LENGTH_SSID )
@@ -1466,7 +1466,7 @@ void update_beacon_info(struct adapter *padapter, u8 *pframe, uint pkt_len, stru pIE = (struct ndis_80211_var_ie *)(pframe + (_BEACON_IE_OFFSET_ +WLAN_HDR_A3_LEN ) + i);switch (pIE->ElementID) { -case _VENDOR_SPECIFIC_IE_: +case WLAN_EID_VENDOR_SPECIFIC :/* to update WMM parameter set while receiving beacon */ if (!memcmp (pIE->data,WMM_PARA_OUI ,6 ) && pIE->Length ==WLAN_WMM_LEN )/* WMM */ if (WMM_param_handler (padapter, pIE))
@@ -1474,12 +1474,12 @@ void update_beacon_info(struct adapter *padapter, u8 *pframe, uint pkt_len, strubreak ; -case _HT_EXTRA_INFO_IE_:/* HT info */ +case WLAN_EID_HT_OPERATION :/* HT info */ /* HT_info_handler(padapter, pIE); */ bwmode_update_check (padapter, pIE);break ; -case _ERPINFO_IE_: +case WLAN_EID_ERP_INFO :ERP_IE_handler (padapter, pIE);VCS_update (padapter, psta);break ;
@@ -1505,13 +1505,13 @@ unsigned int is_ap_in_tkip(struct adapter *padapter) pIE = (struct ndis_80211_var_ie *)(pmlmeinfo->network.IEs + i);switch (pIE->ElementID) { -case _VENDOR_SPECIFIC_IE_: +case WLAN_EID_VENDOR_SPECIFIC :if ((!memcmp (pIE->data,RTW_WPA_OUI ,4 )) && (!memcmp ((pIE->data +12 ),WPA_TKIP_CIPHER ,4 )))return true;break ; -case _RSN_IE_2_: +case WLAN_EID_RSN :if (!memcmp ((pIE->data +8 ),RSN_TKIP_CIPHER ,4 ))return true;break ;
@@ -1581,7 +1581,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len) pIE = (struct ndis_80211_var_ie *)(pframe + i);switch (pIE->ElementID) { -case _VENDOR_SPECIFIC_IE_: +case WLAN_EID_VENDOR_SPECIFIC :if ((!memcmp (pIE->data,ARTHEROS_OUI1 ,3 )) || (!memcmp (pIE->data,ARTHEROS_OUI2 ,3 ))) {DBG_871X ("link to Artheros AP\n" );return HT_IOT_PEER_ATHEROS ;
@@ -1784,7 +1784,7 @@ int update_sta_support_rate(struct adapter *padapter, u8 *pvar_ie, uint var_ie_lstruct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - pIE = (struct ndis_80211_var_ie *)rtw_get_ie (pvar_ie, _SUPPORTEDRATES_IE_, &ie_len, var_ie_len); + pIE = (struct ndis_80211_var_ie *)rtw_get_ie (pvar_ie,WLAN_EID_SUPP_RATES , &ie_len, var_ie_len);if (!pIE)return _FAIL;if (ie_len >sizeof (pmlmeinfo->FW_sta_info[cam_idx].SupportedRates))
@@ -1793,7 +1793,7 @@ int update_sta_support_rate(struct adapter *padapter, u8 *pvar_ie, uint var_ie_lmemcpy (pmlmeinfo->FW_sta_info[cam_idx].SupportedRates, pIE->data, ie_len); supportRateNum = ie_len; - pIE = (struct ndis_80211_var_ie *)rtw_get_ie (pvar_ie, _EXT_SUPPORTEDRATES_IE_, &ie_len, var_ie_len); + pIE = (struct ndis_80211_var_ie *)rtw_get_ie (pvar_ie,WLAN_EID_EXT_SUPP_RATES , &ie_len, var_ie_len);if (pIE && (ie_len <=sizeof (pmlmeinfo->FW_sta_info[cam_idx].SupportedRates) - supportRateNum))memcpy ((pmlmeinfo->FW_sta_info[cam_idx].SupportedRates + supportRateNum), pIE->data, ie_len);
drivers/staging/rtl8723bs/core/rtw_xmit.c +6 -6
@@ -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 */
@@ -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 {
@@ -2251,7 +2251,7 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr pstapriv->sta_dz_bitmap |=BIT (0 );if (update_tim) -update_beacon (padapter, _TIM_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_TIM ,NULL , true);else chk_bmc_sleepq_cmd (padapter);
@@ -2308,7 +2308,7 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_frif (update_tim)/* update BCN for TIM IE */ -update_beacon (padapter, _TIM_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_TIM ,NULL , true); } ret = true;
@@ -2516,7 +2516,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)spin_unlock_bh (&pxmitpriv->lock);if (update_mask) -update_beacon (padapter, _TIM_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_TIM ,NULL , true); }void xmit_delivery_enabled_frames (struct adapter *padapter,struct sta_info *psta)
@@ -2579,7 +2579,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pstif ((psta->sleepq_ac_len ==0 ) && (!psta->has_legacy_ac) && (wmmps_ac)) { pstapriv->tim_bitmap &= ~BIT (psta->aid); -update_beacon (padapter, _TIM_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_TIM ,NULL , true); } }
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +10 -10
@@ -175,21 +175,21 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)/* below for ad-hoc mode */ /* SSID */ - pframe =rtw_set_ie (pframe, _SSID_IE_, cur_network->Ssid.SsidLength, cur_network->Ssid.Ssid, &pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_SSID , cur_network->Ssid.SsidLength, cur_network->Ssid.Ssid, &pktlen);/* supported rates... */ rate_len =rtw_get_rateset_len (cur_network->SupportedRates); - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, ((rate_len >8 ) ?8 : rate_len), cur_network->SupportedRates, &pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , ((rate_len >8 ) ?8 : rate_len), cur_network->SupportedRates, &pktlen);/* DS parameter set */ - pframe =rtw_set_ie (pframe, _DSSET_IE_,1 , (unsigned char *)&(cur_network->Configuration.DSConfig), &pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_DS_PARAMS ,1 , (unsigned char *)&(cur_network->Configuration.DSConfig), &pktlen);if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_ADHOC_STATE ) {u32 ATIMWindow;/* IBSS Parameter Set... */ /* ATIMWindow = cur->Configuration.ATIMWindow; */ ATIMWindow =0 ; - pframe =rtw_set_ie (pframe, _IBSS_PARA_IE_,2 , (unsigned char *)(&ATIMWindow), &pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_IBSS_PARAMS ,2 , (unsigned char *)(&ATIMWindow), &pktlen); }
@@ -198,7 +198,7 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)/* EXTERNDED SUPPORTED RATE */ if (rate_len >8 ) - pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (rate_len -8 ), (cur_network->SupportedRates +8 ), &pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , (rate_len -8 ), (cur_network->SupportedRates +8 ), &pktlen);/* todo:HT for adhoc */
@@ -695,15 +695,15 @@ static void ConstructProbeReq(struct adapter *padapter, u8 *pframe, u32 *pLength pktlen =sizeof (struct ieee80211_hdr_3addr ); pframe += pktlen; - pframe =rtw_set_ie (pframe, _SSID_IE_,0 ,NULL , &pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_SSID ,0 ,NULL , &pktlen);get_rate_set (padapter, bssrate, &bssrate_len);if (bssrate_len >8 ) { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , bssrate, &pktlen); - pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (bssrate_len -8 ), (bssrate +8 ), &pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES ,8 , bssrate, &pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , (bssrate_len -8 ), (bssrate +8 ), &pktlen); }else - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, bssrate_len, bssrate, &pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , bssrate_len, bssrate, &pktlen); *pLength = pktlen; }
@@ -793,7 +793,7 @@ static void ConstructProbeRsp(struct adapter *padapter, u8 *pframe, u32 *pLengthu8 buf[MAX_IE_SZ ];u8 *ies = pframe +sizeof (struct ieee80211_hdr_3addr ); - ssid_ie =rtw_get_ie (ies+_FIXED_IE_LENGTH_, _SSID_IE_, &ssid_ielen, + ssid_ie =rtw_get_ie (ies+_FIXED_IE_LENGTH_,WLAN_EID_SSID , &ssid_ielen, (pframe-ies)-_FIXED_IE_LENGTH_); ssid_ielen_diff = cur_network->Ssid.SsidLength - ssid_ielen;
drivers/staging/rtl8723bs/include/ieee80211.h +0 -8
@@ -348,14 +348,6 @@ struct ieee80211_snap_hdr {#define WLAN_REASON_JOIN_WRONG_CHANNEL 65534#define WLAN_REASON_EXPIRATION_CHK 65535 -/* EIDs defined by IEEE 802.11h - END */ -#define WLAN_EID_HT_CAP 45 -#define WLAN_EID_20_40_BSS_COEXISTENCE 72 -#define WLAN_EID_20_40_BSS_INTOLERANT 73 -#define WLAN_EID_OVERLAPPING_BSS_SCAN_PARAMS 74 -#define WLAN_EID_GENERIC (WLAN_EID_VENDOR_SPECIFIC) -#define WLAN_EID_VHT_OP_MODE_NOTIFY 199 -#define IEEE80211_MGMT_HDR_LEN 24#define IEEE80211_DATA_HDR3_LEN 24#define IEEE80211_DATA_HDR4_LEN 30
drivers/staging/rtl8723bs/include/rtw_security.h +0 -3
@@ -21,9 +21,6 @@const char *security_type_str (u8 value); -#define _WPA_IE_ID_ 0xdd -#define _WPA2_IE_ID_ 0x30 -#define SHA256_MAC_LEN 32#define AES_BLOCK_SIZE 16#define AES_PRIV_SIZE (4 * 44)
drivers/staging/rtl8723bs/include/wifi.h +0 -108
114 lines not on this page · raw message
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +2 -2
@@ -2702,8 +2702,8 @@ static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_lDBG_8192C ("add bcn, wps_ielen =%d\n" , wps_ielen);/* pbss_network->IEs will not include p2p_ie, wfd ie */ -rtw_ies_remove_ie (pbuf, &len, _BEACON_IE_OFFSET_, _VENDOR_SPECIFIC_IE_,P2P_OUI ,4 ); -rtw_ies_remove_ie (pbuf, &len, _BEACON_IE_OFFSET_, _VENDOR_SPECIFIC_IE_,WFD_OUI ,4 ); +rtw_ies_remove_ie (pbuf, &len, _BEACON_IE_OFFSET_,WLAN_EID_VENDOR_SPECIFIC ,P2P_OUI ,4 ); +rtw_ies_remove_ie (pbuf, &len, _BEACON_IE_OFFSET_,WLAN_EID_VENDOR_SPECIFIC ,WFD_OUI ,4 );if (rtw_check_beacon_data (adapter, pbuf, len) == _SUCCESS) { ret =0 ;
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +7 -7
@@ -109,9 +109,9 @@ static char *translate_scan(struct adapter *padapter,/* parsing HT_CAP_IE */ if (pnetwork->network.Reserved[0 ] ==2 ) {/* Probe Request */ - p =rtw_get_ie (&pnetwork->network.IEs[0 ], _HT_CAPABILITY_IE_, &ht_ielen, pnetwork->network.IELength); + p =rtw_get_ie (&pnetwork->network.IEs[0 ],WLAN_EID_HT_CAPABILITY , &ht_ielen, pnetwork->network.IELength); }else { - p =rtw_get_ie (&pnetwork->network.IEs[12 ], _HT_CAPABILITY_IE_, &ht_ielen, pnetwork->network.IELength-12 ); + p =rtw_get_ie (&pnetwork->network.IEs[12 ],WLAN_EID_HT_CAPABILITY , &ht_ielen, pnetwork->network.IELength-12 ); }if (p && ht_ielen >0 ) {struct ieee80211_ht_cap *pht_capie;
@@ -717,7 +717,7 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short iewhile (cnt < ielen) { eid = buf[cnt]; -if ((eid == _VENDOR_SPECIFIC_IE_) && (!memcmp (&buf[cnt+2 ], wps_oui,4 ))) { +if ((eid ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&buf[cnt+2 ], wps_oui,4 ))) {DBG_871X ("SET WPS_IE\n" ); padapter->securitypriv.wps_ie_len = ((buf[cnt+1 ]+2 ) <MAX_WPS_IE_LEN ) ? (buf[cnt+1 ]+2 ):MAX_WPS_IE_LEN ;
@@ -771,7 +771,7 @@ static int rtw_wx_get_name(struct net_device *dev,if (check_fwstate (pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE ) == true) {/* parsing HT_CAP_IE */ - p =rtw_get_ie (&pcur_bss->IEs[12 ], _HT_CAPABILITY_IE_, &ht_ielen, pcur_bss->IELength-12 ); + p =rtw_get_ie (&pcur_bss->IEs[12 ],WLAN_EID_HT_CAPABILITY , &ht_ielen, pcur_bss->IELength-12 );if (p && ht_ielen >0 ) ht_cap = true;
@@ -3945,7 +3945,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param) psta =rtw_get_stainfo (pstapriv, param->sta_addr);if (psta) { -if ((psta->wpa_ie[0 ] ==WLAN_EID_RSN ) || (psta->wpa_ie[0 ] ==WLAN_EID_GENERIC )) { +if ((psta->wpa_ie[0 ] ==WLAN_EID_RSN ) || (psta->wpa_ie[0 ] ==WLAN_EID_VENDOR_SPECIFIC )) {int wpa_ie_len;int copy_len;
@@ -3998,7 +3998,7 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param,memcpy (pmlmepriv->wps_beacon_ie, param->u.bcn_ie.buf, ie_len); -update_beacon (padapter, _VENDOR_SPECIFIC_IE_, wps_oui, true); +update_beacon (padapter,WLAN_EID_VENDOR_SPECIFIC , wps_oui, true); pmlmeext->bstart_bss = true; }
@@ -4361,7 +4361,7 @@ static int rtw_wx_set_priv(struct net_device *dev,int probereq_wpsie_len = len;u8 wps_oui[4 ] = {0x0 ,0x50 ,0xf2 ,0x04 }; -if ((_VENDOR_SPECIFIC_IE_ == probereq_wpsie[0 ]) && +if ((WLAN_EID_VENDOR_SPECIFIC == probereq_wpsie[0 ]) && (!memcmp (&probereq_wpsie[2 ], wps_oui,4 ))) { cp_sz = probereq_wpsie_len >MAX_WPS_IE_LEN ?MAX_WPS_IE_LEN : probereq_wpsie_len;
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +1 -1
@@ -147,7 +147,7 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)RT_TRACE (_module_mlme_osdep_c_, _drv_info_, ("+rtw_report_sec_ie, authmode =%d\n" , authmode)); buff =NULL ; -if (authmode == _WPA_IE_ID_) { +if (authmode ==WLAN_EID_VENDOR_SPECIFIC ) {RT_TRACE (_module_mlme_osdep_c_, _drv_info_, ("rtw_report_sec_ie, authmode =%d\n" , authmode)); buff =rtw_zmalloc (IW_CUSTOM_MAX );
Signature · 1 line
2.25.1
Greg KH
maintainerRe: [PATCH 10/10] staging: rtl8723bs: replace unique macros and ELEMENT_ID
Quoted 11 lines · Ross Schmidt
Replace unique macros and
ELEMENT_IDwith kernel providedieee80211_eidenum.In a several cases multiple macros or constants are replaced by one constant.
WLAN_EID_HT_CAP, _HT_CAPABILITY_IE_, andEID_HTCapabilityare replace byWLAN_EID_HT_CAPABILITY._WPA2_IE_ID_,
EID_WPA2, and _RSN_IE_2_ are replaced byWLAN_EID_RSN.
Quoted 7 lines
_HT_EXTRA_INFO_IE_ and _HT_ADD_INFO_IE_ are replaced by
WLAN_EID_HT_OPERATION.
WLAN_EID_GENERIC, _WPA_IE_ID_, _SSN_IE_1_, and _VENDOR_SPECIFIC_IE_ are replaced byWLAN_EID_VENDOR_SPECIFIC.Signed-off-by Ross Schmidt <[email protected]>
All other patches in this series applied cleanly, please rebase this one and resend.
You might want to break it up into one-patch-per-constant replacement
thanks,
greg k-h