replace unique macros and ELEMENT_ID
v2 cover replace unique macros and ELEMENT_ID
This patch set replaces many macros and the ELEMENT_ID enum with the ieee80211_eid enum from linux/ieee80211.h. In several cases more than one macro or constant is replaced by one constant. As suggested, each constant replacement is separated into a distinct patch.
Changes in v2:
- Single patch divided into per-constant replacement patches
v1 can be found here:
https://lore.kernel.org/driverdev-devel/[email protected]/
Ross Schmidt (21):
staging: rtl8723bs: use WLAN_EID_HT_CAPABILITY
staging: rtl8723bs: use WLAN_EID_VENDOR_SPECIFIC
staging: rtl8723bs: use WLAN_EID_RSN
staging: rtl8723bs: use WLAN_EID_HT_OPERATION
staging: rtl8723bs: replace WLAN_EID_VHT_OP_MODE_NOTIFY
staging: rtl8723bs: replace _SSID_IE_
staging: rtl8723bs: replace _SUPPORTEDRATES_IE_
staging: rtl8723bs: replace _DSSET_IE_
staging: rtl8723bs: replace _TIM_IE_
staging: rtl8723bs: replace _IBSS_PARA_IE_
staging: rtl8723bs: replace _COUNTRY_IE_
staging: rtl8723bs: replace _CHLGETXT_IE_
staging: rtl8723bs: replace _ERPINFO_IE_
staging: rtl8723bs: replace _EXT_SUPPORTEDRATES_IE_
staging: rtl8723bs: replace _WAPI_IE_
staging: rtl8723bs: replace _MME_IE_
staging: rtl8723bs: replace EID_BSSCoexistence
staging: rtl8723bs: replace EID_BSSIntolerantChlReport
staging: rtl8723bs: replace EID_EXTCapability
staging: rtl8723bs: remove unused macros
staging: rtl8723bs: remove ELEMENT_ID enum
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(-)
Signature · 1 line
2.25.1
PATCH v2 1/21 staging: rtl8723bs: use WLAN_EID_HT_CAPABILITY
Replace unique WLAN_EID_HT_CAP, _HT_CAPABILITY_IE_, and EID_HTCapability with kernel provided WLAN_EID_HT_CAPABILITY from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_mlme.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 14 +++++++------- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/include/ieee80211.h | 1 - drivers/staging/rtl8723bs/include/wifi.h | 1 - drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 6 +++--- 9 files changed, 20 insertions(+), 22 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +4 -4
@@ -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_) );
@@ -1774,7 +1774,7 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)break ; -case _HT_CAPABILITY_IE_: +case WLAN_EID_HT_CAPABILITY :update_bcn_htcap_ie (padapter);
@@ -2052,7 +2052,7 @@ 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,WLAN_EID_HT_CAPABILITY ,NULL , false);update_beacon (padapter, _HT_ADD_INFO_IE_,NULL , true); }
@@ -2116,7 +2116,7 @@ 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,WLAN_EID_HT_CAPABILITY ,NULL , false);update_beacon (padapter, _HT_ADD_INFO_IE_,NULL , true); }
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -1
@@ -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. */
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +2 -2
@@ -1056,7 +1056,7 @@ ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len, elems->timeout_int = pos; elems->timeout_int_len = elen;break ; -case WLAN_EID_HT_CAP : +case WLAN_EID_HT_CAPABILITY : elems->ht_capabilities = pos; elems->ht_capabilities_len = elen;break ;
@@ -1209,7 +1209,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)/* get bwmode and ch_offset */ /* parsing HT_CAP_IE */ - p =rtw_get_ie (pnetwork->network.IEs + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len, pnetwork->network.IELength - _FIXED_IE_LENGTH_); + p =rtw_get_ie (pnetwork->network.IEs + _FIXED_IE_LENGTH_,WLAN_EID_HT_CAPABILITY , &len, pnetwork->network.IELength - _FIXED_IE_LENGTH_);if (p && len >0 ) { pht_cap = (struct ieee80211_ht_cap *)(p +2 ); pnetwork->BcnInfo.ht_cap_info =le16_to_cpu (pht_cap->cap_info);
drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -2
@@ -2718,7 +2718,7 @@ 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;
@@ -2768,7 +2768,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 );
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +7 -7
@@ -1697,7 +1697,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame)WMM_param_handler (padapter, pIE);break ; -case _HT_CAPABILITY_IE_:/* HT caps */ +case WLAN_EID_HT_CAPABILITY :/* HT caps */ HT_caps_handler (padapter, pIE);break ;
@@ -3164,7 +3164,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i/* FILL HT CAP INFO IE */ /* p = hostapd_eid_ht_capabilities_info(hapd, p); */ - pbuf =rtw_get_ie (ie + _BEACON_IE_OFFSET_, _HT_CAPABILITY_IE_, &ie_len, (pnetwork->IELength - _BEACON_IE_OFFSET_)); + pbuf =rtw_get_ie (ie + _BEACON_IE_OFFSET_,WLAN_EID_HT_CAPABILITY , &ie_len, (pnetwork->IELength - _BEACON_IE_OFFSET_));if (pbuf && ie_len >0 ) {memcpy (pframe, pbuf, ie_len+2 ); pframe += (ie_len+2 );
@@ -3372,11 +3372,11 @@ void issue_assocreq(struct adapter *padapter)case EID_WPA2 : pframe =rtw_set_ie (pframe,EID_WPA2 , pIE->Length, pIE->data, &(pattrib->pktlen));break ; -case EID_HTCapability: +case WLAN_EID_HT_CAPABILITY :if (padapter->mlmepriv.htpriv.ht_option) {if (!(is_ap_in_tkip (padapter))) {memcpy (&(pmlmeinfo->HT_caps), pIE->data,sizeof (struct HT_caps_element )); - pframe =rtw_set_ie (pframe, EID_HTCapability, pIE->Length, (u8 *)(&(pmlmeinfo->HT_caps)), &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_HT_CAPABILITY , pIE->Length, (u8 *)(&(pmlmeinfo->HT_caps)), &(pattrib->pktlen)); } }break ;
@@ -4125,7 +4125,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) pbss_network = (struct wlan_bssid_ex *)&pnetwork->network; - p =rtw_get_ie (pbss_network->IEs + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len, pbss_network->IELength - _FIXED_IE_LENGTH_); + p =rtw_get_ie (pbss_network->IEs + _FIXED_IE_LENGTH_,WLAN_EID_HT_CAPABILITY , &len, pbss_network->IELength - _FIXED_IE_LENGTH_);if ((p ==NULL ) || (len ==0 )) {/* non-HT */ if ((pbss_network->Configuration.DSConfig <=0 ) || (pbss_network->Configuration.DSConfig >14 ))
@@ -4553,7 +4553,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, strif ((pregistrypriv->wifi_spec ==1 ) && (false == pmlmeinfo->bwmode_updated)) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - p =rtw_get_ie (bssid->IEs + ie_offset, _HT_CAPABILITY_IE_, &len, bssid->IELength - ie_offset); + p =rtw_get_ie (bssid->IEs + ie_offset,WLAN_EID_HT_CAPABILITY , &len, bssid->IELength - ie_offset);if (p && len >0 ) {struct HT_caps_element *pHT_caps;
@@ -6178,7 +6178,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)WMM_param_handler (padapter, pIE);break ; -case _HT_CAPABILITY_IE_:/* Get HT Cap IE. */ +case WLAN_EID_HT_CAPABILITY :/* Get HT Cap IE. */ pmlmeinfo->HT_caps_enable =1 ;break ;
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -1
@@ -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);
drivers/staging/rtl8723bs/include/ieee80211.h +0 -1
@@ -349,7 +349,6 @@ struct ieee80211_snap_hdr {#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
drivers/staging/rtl8723bs/include/wifi.h +0 -1
@@ -401,7 +401,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _ERPINFO_IE_ 42#define _EXT_SUPPORTEDRATES_IE_ 50 -#define _HT_CAPABILITY_IE_ 45#define _FTIE_ 55#define _TIMEOUT_ITVL_IE_ 56#define _SRC_IE_ 59
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +3 -3
@@ -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;
@@ -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;
Signature · 1 line
2.25.1
PATCH v2 2/21 staging: rtl8723bs: use WLAN_EID_VENDOR_SPECIFIC
In reply to Ross SchmidtReplace unique WLAN_EID_GENERIC, _WPA_IE_ID_, _SSN_IE_1_, and _VENDOR_SPECIFIC_IE_ macros with kernel provided WLAN_EID_VENDOR_SPECIFIC from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 6 +++--- .../staging/rtl8723bs/core/rtw_ieee80211.c | 12 +++++------ drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +++--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 20 +++++++++---------- .../staging/rtl8723bs/core/rtw_wlan_util.c | 6 +++--- drivers/staging/rtl8723bs/include/ieee80211.h | 1 - .../staging/rtl8723bs/include/rtw_security.h | 1 - drivers/staging/rtl8723bs/include/wifi.h | 2 -- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 ++-- .../staging/rtl8723bs/os_dep/ioctl_linux.c | 8 ++++---- drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 2 +- 11 files changed, 32 insertions(+), 36 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +3 -3
@@ -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 )) );
@@ -1792,7 +1792,7 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)break ; -case _VENDOR_SPECIFIC_IE_: +case WLAN_EID_VENDOR_SPECIFIC :update_bcn_vendor_spec_ie (padapter, oui);
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +6 -6
@@ -383,7 +383,7 @@ unsigned char *rtw_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit)__le16 le_tmp;while (1 ) { - pbuf =rtw_get_ie (pbuf, _WPA_IE_ID_, &len, limit_new); + pbuf =rtw_get_ie (pbuf,WLAN_EID_VENDOR_SPECIFIC , &len, limit_new);if (pbuf) {/* check if oui matches... */
@@ -471,7 +471,7 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwisreturn _FAIL; } -if ((*wpa_ie != _WPA_IE_ID_) || (*(wpa_ie+1 ) != (u8)(wpa_ie_len -2 )) || +if ((*wpa_ie !=WLAN_EID_VENDOR_SPECIFIC ) || (*(wpa_ie+1 ) != (u8)(wpa_ie_len -2 )) || (memcmp (wpa_ie+2 ,RTW_WPA_OUI_TYPE ,WPA_SELECTOR_LEN ))) {return _FAIL; }
@@ -667,7 +667,7 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_iewhile (cnt < in_len) { authmode = in_ie[cnt]; -if ((authmode == _WPA_IE_ID_) && (!memcmp (&in_ie[cnt+2 ], &wpa_oui[0 ],4 ))) { +if ((authmode ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&in_ie[cnt+2 ], &wpa_oui[0 ],4 ))) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("\n rtw_get_wpa_ie: sec_idx =%d in_ie[cnt+1]+2 =%d\n" , sec_idx, in_ie[cnt+1 ]+2 ));if (wpa_ie) {
@@ -715,7 +715,7 @@ u8 rtw_is_wps_ie(u8 *ie_ptr, uint *wps_ielen) eid = ie_ptr[0 ]; -if ((eid == _WPA_IE_ID_) && (!memcmp (&ie_ptr[2 ], wps_oui,4 ))) { +if ((eid ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&ie_ptr[2 ], wps_oui,4 ))) {/* DBG_8192C("==> found WPS_IE.....\n"); */ *wps_ielen = ie_ptr[1 ]+2 ; match = true;
@@ -749,7 +749,7 @@ u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen)while (cnt < in_len) { eid = in_ie[cnt]; -if ((eid == _WPA_IE_ID_) && (!memcmp (&in_ie[cnt+2 ], wps_oui,4 ))) { +if ((eid ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&in_ie[cnt+2 ], wps_oui,4 ))) { wpsie_ptr = &in_ie[cnt];if (wps_ie)
@@ -788,7 +788,7 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8 *buf_attif (len_attr) *len_attr =0 ; -if ((wps_ie[0 ] != _VENDOR_SPECIFIC_IE_) || +if ((wps_ie[0 ] !=WLAN_EID_VENDOR_SPECIFIC ) || (memcmp (wps_ie +2 , wps_oui,4 ))) {return attr_ptr; }
drivers/staging/rtl8723bs/core/rtw_mlme.c +3 -3
@@ -2359,7 +2359,7 @@ 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_;
@@ -2367,7 +2367,7 @@ sint rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint inmemcpy (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 == _WPA2_IE_ID_)) {/* copy RSN or SSN */ memcpy (&out_ie[ielength], &psecuritypriv->supplicant_ie[0 ], psecuritypriv->supplicant_ie[1 ]+2 );/* debug for CONFIG_IEEE80211W
@@ -2574,7 +2574,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 ;
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +10 -10
@@ -628,7 +628,7 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame)u8 RC_OUI [4 ] = {0x00 ,0xE0 ,0x4C ,0x0A };/* EID[1] + EID_LEN[1] + RC_OUI[4] + MAC[6] + PairingID[2] + ChannelNum[2] */ - p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _VENDOR_SPECIFIC_IE_, (int *)&ielen, + p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_,WLAN_EID_VENDOR_SPECIFIC , (int *)&ielen, len -WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_);if (!p || ielen !=14 )
@@ -1445,7 +1445,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)if (pmlmepriv->qospriv.qos_option) { p = pframe +WLAN_HDR_A3_LEN + ie_offset; ie_len =0 ;for (;;) { - p =rtw_get_ie (p, _VENDOR_SPECIFIC_IE_, &ie_len, pkt_len -WLAN_HDR_A3_LEN - ie_offset); + p =rtw_get_ie (p,WLAN_EID_VENDOR_SPECIFIC , &ie_len, pkt_len -WLAN_HDR_A3_LEN - ie_offset);if (p) {if (!memcmp (p+2 ,WMM_IE ,6 )) {
@@ -1692,7 +1692,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame) pIE = (struct ndis_80211_var_ie *)(pframe + i);switch (pIE->ElementID) { -case _VENDOR_SPECIFIC_IE_: +case WLAN_EID_VENDOR_SPECIFIC :if (!memcmp (pIE->data,WMM_PARA_OUI ,6 ))/* WMM */ WMM_param_handler (padapter, pIE);break ;
@@ -2796,7 +2796,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2pmemcpy (&RC_INFO [10 ], (u8 *)&psta->pid,2 );memcpy (&RC_INFO [12 ], (u8 *)&cu_ch,2 ); - pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, sizeof(RC_INFO), RC_INFO, &pattrib->pktlen); + pframe = rtw_set_ie(pframe, WLAN_EID_VENDOR_SPECIFIC, sizeof(RC_INFO), RC_INFO, &pattrib->pktlen); } }#endif /* CONFIG_AUTO_AP_MODE */
@@ -3188,7 +3188,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_iunsigned char WMM_PARA_IE [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 };for (pbuf = ie + _BEACON_IE_OFFSET_; ; pbuf += (ie_len +2 )) { - pbuf =rtw_get_ie (pbuf, _VENDOR_SPECIFIC_IE_, &ie_len, (pnetwork->IELength - _BEACON_IE_OFFSET_ - (ie_len +2 ))); + pbuf =rtw_get_ie (pbuf,WLAN_EID_VENDOR_SPECIFIC , &ie_len, (pnetwork->IELength - _BEACON_IE_OFFSET_ - (ie_len +2 )));if (pbuf && !memcmp (pbuf+2 ,WMM_PARA_IE ,6 )) {memcpy (pframe, pbuf, ie_len+2 ); pframe += (ie_len+2 );
@@ -3205,7 +3205,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i }if (pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_REALTEK ) { - pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_,6 ,REALTEK_96B_IE , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_VENDOR_SPECIFIC ,6 ,REALTEK_96B_IE , &(pattrib->pktlen)); }/* add WPS IE ie for wps 2.0 */
@@ -3350,7 +3350,7 @@ void issue_assocreq(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,WMM_OUI ,4 )) || (!memcmp (pIE->data,WPS_OUI ,4 ))) {
@@ -3365,7 +3365,7 @@ void issue_assocreq(struct adapter *padapter) vs_ie_length =14 ; } - pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_, vs_ie_length, pIE->data, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_VENDOR_SPECIFIC , vs_ie_length, pIE->data, &(pattrib->pktlen)); }break ;
@@ -3393,7 +3393,7 @@ void issue_assocreq(struct adapter *padapter) }if (pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_REALTEK ) - pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_,6 ,REALTEK_96B_IE , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_VENDOR_SPECIFIC ,6 ,REALTEK_96B_IE , &(pattrib->pktlen)); pattrib->last_txcmdsz = pattrib->pktlen;
@@ -6173,7 +6173,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) pIE = (struct ndis_80211_var_ie *)(pnetwork->IEs + i);switch (pIE->ElementID) { -case _VENDOR_SPECIFIC_IE_:/* Get WMM IE. */ +case WLAN_EID_VENDOR_SPECIFIC :/* Get WMM IE. */ if (!memcmp (pIE->data,WMM_OUI ,4 ))WMM_param_handler (padapter, pIE);break ;
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +3 -3
@@ -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))
@@ -1505,7 +1505,7 @@ 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;
@@ -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 ;
drivers/staging/rtl8723bs/include/ieee80211.h +0 -1
@@ -352,7 +352,6 @@ struct ieee80211_snap_hdr {#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
drivers/staging/rtl8723bs/include/rtw_security.h +0 -1
@@ -21,7 +21,6 @@const char *security_type_str (u8 value); -#define _WPA_IE_ID_ 0xdd#define _WPA2_IE_ID_ 0x30#define SHA256_MAC_LEN 32
drivers/staging/rtl8723bs/include/wifi.h +0 -2
@@ -397,7 +397,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _SUPPORTED_CH_IE_ 36#define _CH_SWTICH_ANNOUNCE_ 37/* Secondary Channel Offset */ #define _RSN_IE_2_ 48 -#define _SSN_IE_1_ 221#define _ERPINFO_IE_ 42#define _EXT_SUPPORTEDRATES_IE_ 50
@@ -414,7 +413,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _CH_SWITCH_TIMING_ 104#define _PTI_BUFFER_STATUS_ 106#define _EXT_CAP_IE_ 127 -#define _VENDOR_SPECIFIC_IE_ 221#define _RESERVED47_ 47
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 +4 -4
@@ -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 ;
@@ -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
PATCH v2 3/21 staging: rtl8723bs: use WLAN_EID_RSN
In reply to Ross SchmidtReplace unique _WPA2_IE_ID_, EID_WPA2, and _RSN_IE_2_ with kernel provided WLAN_EID_RSN from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 6 +++--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/include/rtw_security.h | 2 -- drivers/staging/rtl8723bs/include/wifi.h | 1 - 7 files changed, 12 insertions(+), 15 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +2 -2
@@ -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_) );
@@ -1780,7 +1780,7 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)break ; -case _RSN_IE_2_: +case WLAN_EID_RSN :update_bcn_rsn_ie (padapter);
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +3 -3
@@ -424,7 +424,7 @@ unsigned char *rtw_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit)unsigned char *rtw_get_wpa2_ie (unsigned char *pie,int *rsn_ie_len,int limit) { -return rtw_get_ie (pie, _WPA2_IE_ID_, rsn_ie_len, limit); +return rtw_get_ie (pie,WLAN_EID_RSN , rsn_ie_len, limit); }int rtw_get_wpa_cipher_suite (u8 *s)
@@ -544,7 +544,7 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwireturn _FAIL; } -if ((*rsn_ie != _WPA2_IE_ID_) || (*(rsn_ie+1 ) != (u8)(rsn_ie_len -2 ))) { +if ((*rsn_ie !=WLAN_EID_RSN ) || (*(rsn_ie+1 ) != (u8)(rsn_ie_len -2 ))) {return _FAIL; }
@@ -683,7 +683,7 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie *wpa_len = in_ie[cnt+1 ]+2 ; cnt += in_ie[cnt+1 ]+2 ;/* get next */ }else { -if (authmode == _WPA2_IE_ID_) { +if (authmode ==WLAN_EID_RSN ) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("\n get_rsn_ie: sec_idx =%d in_ie[cnt+1]+2 =%d\n" , sec_idx, in_ie[cnt+1 ]+2 ));if (rsn_ie) {
drivers/staging/rtl8723bs/core/rtw_mlme.c +4 -4
@@ -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
@@ -2361,13 +2361,13 @@ sint rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint inif ((ndisauthmode == Ndis802_11AuthModeWPA) || (ndisauthmode == Ndis802_11AuthModeWPAPSK)) 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 ==WLAN_EID_VENDOR_SPECIFIC ) || (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
@@ -2386,7 +2386,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;
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +2 -2
@@ -3369,8 +3369,8 @@ void issue_assocreq(struct adapter *padapter) }break ; -case EID_WPA2 : - pframe =rtw_set_ie (pframe,EID_WPA2 , pIE->Length, pIE->data, &(pattrib->pktlen)); +case WLAN_EID_RSN : + pframe =rtw_set_ie (pframe,WLAN_EID_RSN , pIE->Length, pIE->data, &(pattrib->pktlen));break ;case WLAN_EID_HT_CAPABILITY :if (padapter->mlmepriv.htpriv.ht_option) {
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -1
@@ -1511,7 +1511,7 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)break ; -case _RSN_IE_2_: +case WLAN_EID_RSN :if (!memcmp ((pIE->data +8 ),RSN_TKIP_CIPHER ,4 ))return true;break ;
drivers/staging/rtl8723bs/include/rtw_security.h +0 -2
@@ -21,8 +21,6 @@const char *security_type_str (u8 value); -#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 -1
@@ -396,7 +396,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _CHLGETXT_IE_ 16#define _SUPPORTED_CH_IE_ 36#define _CH_SWTICH_ANNOUNCE_ 37/* Secondary Channel Offset */ -#define _RSN_IE_2_ 48#define _ERPINFO_IE_ 42#define _EXT_SUPPORTEDRATES_IE_ 50
Signature · 1 line
2.25.1
PATCH v2 4/21 staging: rtl8723bs: use WLAN_EID_HT_OPERATION
In reply to Ross SchmidtReplace unique _HT_EXTRA_INFO_IE_ and _HT_ADD_INFO_IE_ macros with kernel provided WLAN_EID_HT_OPERATION from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 10 +++++----- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 6 +++--- drivers/staging/rtl8723bs/include/wifi.h | 2 -- 6 files changed, 17 insertions(+), 19 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +5 -5
@@ -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 )) );
@@ -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_) );
@@ -1786,7 +1786,7 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)break ; -case _HT_ADD_INFO_IE_: +case WLAN_EID_HT_OPERATION :update_bcn_htinfo_ie (padapter);
@@ -2053,7 +2053,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)if (rtw_ht_operation_update (padapter) >0 ) {update_beacon (padapter,WLAN_EID_HT_CAPABILITY ,NULL , false); -update_beacon (padapter, _HT_ADD_INFO_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_HT_OPERATION ,NULL , true); }/* update associated stations cap. */
@@ -2117,7 +2117,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)if (rtw_ht_operation_update (padapter) >0 ) {update_beacon (padapter,WLAN_EID_HT_CAPABILITY ,NULL , false); -update_beacon (padapter, _HT_ADD_INFO_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_HT_OPERATION ,NULL , true); }/* update associated stations cap. */
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +1 -1
@@ -1217,7 +1217,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) pnetwork->BcnInfo.ht_cap_info =0 ; }/* parsing HT_INFO_IE */ - p =rtw_get_ie (pnetwork->network.IEs + _FIXED_IE_LENGTH_, _HT_ADD_INFO_IE_, &len, pnetwork->network.IELength - _FIXED_IE_LENGTH_); + p =rtw_get_ie (pnetwork->network.IEs + _FIXED_IE_LENGTH_,WLAN_EID_HT_OPERATION , &len, pnetwork->network.IELength - _FIXED_IE_LENGTH_);if (p && len >0 ) { pht_info = (struct HT_info_element *)(p +2 ); pnetwork->BcnInfo.ht_info_infos_0 = pht_info->infos[0 ];
drivers/staging/rtl8723bs/core/rtw_mlme.c +4 -4
@@ -2616,7 +2616,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 );
@@ -2724,10 +2724,10 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ 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); } }
@@ -2780,7 +2780,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: */
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +4 -4
@@ -1701,7 +1701,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame)HT_caps_handler (padapter, pIE);break ; -case _HT_EXTRA_INFO_IE_:/* HT info */ +case WLAN_EID_HT_OPERATION :/* HT info */ HT_info_handler (padapter, pIE);break ;
@@ -3173,7 +3173,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i/* FILL HT ADD INFO IE */ /* p = hostapd_eid_ht_operation(hapd, p); */ - pbuf =rtw_get_ie (ie + _BEACON_IE_OFFSET_, _HT_ADD_INFO_IE_, &ie_len, (pnetwork->IELength - _BEACON_IE_OFFSET_)); + pbuf =rtw_get_ie (ie + _BEACON_IE_OFFSET_,WLAN_EID_HT_OPERATION , &ie_len, (pnetwork->IELength - _BEACON_IE_OFFSET_));if (pbuf && ie_len >0 ) {memcpy (pframe, pbuf, ie_len+2 ); pframe += (ie_len+2 );
@@ -4519,7 +4519,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str }else {/* In 5G, some ap do not have DSSET IE */ /* checking HT info for channel */ - p =rtw_get_ie (bssid->IEs + ie_offset, _HT_ADD_INFO_IE_, &len, bssid->IELength - ie_offset); + p =rtw_get_ie (bssid->IEs + ie_offset,WLAN_EID_HT_OPERATION , &len, bssid->IELength - ie_offset);if (p) {struct HT_info_element *HT_info = (struct HT_info_element *)(p +2 );
@@ -6182,7 +6182,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) pmlmeinfo->HT_caps_enable =1 ;break ; -case _HT_EXTRA_INFO_IE_:/* Get HT Info IE. */ +case WLAN_EID_HT_OPERATION :/* Get HT Info IE. */ pmlmeinfo->HT_info_enable =1 ;/* spec case only for cisco's ap because cisco's ap issue assoc rsp using mcs rate @40MHz or @20MHz */
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +3 -3
@@ -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 ];
@@ -1325,7 +1325,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)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 */
@@ -1474,7 +1474,7 @@ 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 ;
drivers/staging/rtl8723bs/include/wifi.h +0 -2
@@ -402,8 +402,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _FTIE_ 55#define _TIMEOUT_ITVL_IE_ 56#define _SRC_IE_ 59 -#define _HT_EXTRA_INFO_IE_ 61 -#define _HT_ADD_INFO_IE_ 61/* _HT_EXTRA_INFO_IE_ */ #define _WAPI_IE_ 68#define _RIC_Descriptor_IE_ 75
Signature · 1 line
2.25.1
PATCH v2 5/21 staging: rtl8723bs: replace WLAN_EID_VHT_OP_MODE_NOTIFY
In reply to Ross SchmidtReplace unique WLAN_EID_VHT_OP_MODE_NOFITY macro with kernel provided WLAN_EID_OPMODE_NOTIF from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 2 +- drivers/staging/rtl8723bs/include/ieee80211.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +1 -1
@@ -1072,7 +1072,7 @@ ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len, elems->vht_operation = pos; elems->vht_operation_len = elen;break ; -case WLAN_EID_VHT_OP_MODE_NOTIFY : +case WLAN_EID_OPMODE_NOTIF : elems->vht_op_mode_notify = pos; elems->vht_op_mode_notify_len = elen;break ;
drivers/staging/rtl8723bs/include/ieee80211.h +0 -1
@@ -352,7 +352,6 @@ struct ieee80211_snap_hdr {#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_VHT_OP_MODE_NOTIFY 199#define IEEE80211_MGMT_HDR_LEN 24#define IEEE80211_DATA_HDR3_LEN 24
Signature · 1 line
2.25.1
PATCH v2 6/21 staging: rtl8723bs: replace _SSID_IE_
In reply to Ross SchmidtReplace unique _SSID_IE_ macro with kernel provided WLAN_EID_SSID from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 4 ++-- .../staging/rtl8723bs/core/rtw_ieee80211.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 20 +++++++++---------- .../staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 6 +++--- drivers/staging/rtl8723bs/include/wifi.h | 1 - 6 files changed, 17 insertions(+), 18 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +2 -2
@@ -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_) );
@@ -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_) );
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +1 -1
@@ -326,7 +326,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv) ie +=2 ;/* SSID */ - ie =rtw_set_ie (ie, _SSID_IE_, pdev_network->Ssid.SsidLength, pdev_network->Ssid.Ssid, &sz); + ie =rtw_set_ie (ie,WLAN_EID_SSID , pdev_network->Ssid.SsidLength, pdev_network->Ssid.Ssid, &sz);/* supported rates */ if (pregistrypriv->wireless_mode ==WIRELESS_11ABGN ) {
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +10 -10
@@ -728,7 +728,7 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame)#endif /* CONFIG_AUTO_AP_MODE */ - p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _SSID_IE_, (int *)&ielen, + p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_,WLAN_EID_SSID , (int *)&ielen, len -WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_);
@@ -1251,7 +1251,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)/* now we should check all the fields... */ /* checking SSID */ - p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + ie_offset, _SSID_IE_, &ie_len, + p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + ie_offset,WLAN_EID_SSID , &ie_len, pkt_len -WLAN_HDR_A3_LEN - ie_offset);if (!p || ie_len ==0 ) {
@@ -2536,7 +2536,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) pattrib->pktlen +=2 ;/* SSID */ - pframe =rtw_set_ie (pframe, _SSID_IE_, cur_network->Ssid.SsidLength, cur_network->Ssid.Ssid, &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_SSID , cur_network->Ssid.SsidLength, cur_network->Ssid.Ssid, &pattrib->pktlen);/* supported rates... */ rate_len =rtw_get_rateset_len (cur_network->SupportedRates);
@@ -2692,7 +2692,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2pu8 buf[MAX_IE_SZ ];u8 *ies = pmgntframe->buf_addr+TXDESC_OFFSET +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;
@@ -2740,7 +2740,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p/* below for ad-hoc mode */ /* SSID */ - pframe =rtw_set_ie (pframe, _SSID_IE_, cur_network->Ssid.SsidLength, cur_network->Ssid.Ssid, &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_SSID , cur_network->Ssid.SsidLength, cur_network->Ssid.Ssid, &pattrib->pktlen);/* supported rates... */ rate_len =rtw_get_rateset_len (cur_network->SupportedRates);
@@ -2870,9 +2870,9 @@ static int _issue_probereq(struct adapter *padapter, pattrib->pktlen =sizeof (struct ieee80211_hdr_3addr );if (pssid) - pframe =rtw_set_ie (pframe, _SSID_IE_, pssid->SsidLength, pssid->Ssid, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SSID , pssid->SsidLength, pssid->Ssid, &(pattrib->pktlen));else - pframe =rtw_set_ie (pframe, _SSID_IE_,0 ,NULL , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SSID ,0 ,NULL , &(pattrib->pktlen));get_rate_set (padapter, bssrate, &bssrate_len);
@@ -3280,7 +3280,7 @@ void issue_assocreq(struct adapter *padapter) pattrib->pktlen +=2 ;/* SSID */ - pframe =rtw_set_ie (pframe, _SSID_IE_, pmlmeinfo->network.Ssid.SsidLength, pmlmeinfo->network.Ssid.Ssid, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SSID , pmlmeinfo->network.Ssid.SsidLength, pmlmeinfo->network.Ssid.Ssid, &(pattrib->pktlen));/* supported rate & extended supported rate */
@@ -4464,7 +4464,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str bssid->PhyInfo.SignalStrength = precv_frame->u.hdr.attrib.phy_info.SignalStrength;/* in percentage */ /* checking SSID */ - p =rtw_get_ie (bssid->IEs + ie_offset, _SSID_IE_, &len, bssid->IELength - ie_offset); + p =rtw_get_ie (bssid->IEs + ie_offset,WLAN_EID_SSID , &len, bssid->IELength - ie_offset);if (p ==NULL ) {DBG_871X ("marc: cannot find SSID for survey event\n" );return _FAIL;
@@ -5959,7 +5959,7 @@ static int rtw_auto_ap_start_beacon(struct adapter *adapter) ie +=2 ;/* SSID */ - ie =rtw_set_ie (ie, _SSID_IE_, ssid_len, ssid, &sz); + ie =rtw_set_ie (ie,WLAN_EID_SSID , ssid_len, ssid, &sz);/* supported rates */ wireless_mode =WIRELESS_11BG_24N ;
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -1
@@ -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 )
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +3 -3
@@ -175,7 +175,7 @@ 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);
@@ -695,7 +695,7 @@ 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);
@@ -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/wifi.h +0 -1
@@ -387,7 +387,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _FIXED_IE_LENGTH_ _BEACON_IE_OFFSET_ -#define _SSID_IE_ 0#define _SUPPORTEDRATES_IE_ 1#define _DSSET_IE_ 3#define _TIM_IE_ 5
Signature · 1 line
2.25.1
PATCH v2 7/21 staging: rtl8723bs: replace _SUPPORTEDRATES_IE_
In reply to Ross SchmidtReplace unique _SUPPORTEDRATES_IE_ macro with kernel provided WLAN_EID_SUPP_RATES from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 4 ++-- .../staging/rtl8723bs/core/rtw_ieee80211.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 24 +++++++++---------- .../staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 6 ++--- drivers/staging/rtl8723bs/include/wifi.h | 1 - 6 files changed, 20 insertions(+), 21 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +2 -2
@@ -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)
@@ -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_) );
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +2 -2
@@ -343,10 +343,10 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv) rateLen =rtw_get_rateset_len (pdev_network->SupportedRates);if (rateLen >8 ) { - ie =rtw_set_ie (ie, _SUPPORTEDRATES_IE_,8 , pdev_network->SupportedRates, &sz); + ie =rtw_set_ie (ie,WLAN_EID_SUPP_RATES ,8 , pdev_network->SupportedRates, &sz);/* ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz); */ }else { - ie =rtw_set_ie (ie, _SUPPORTEDRATES_IE_, rateLen, pdev_network->SupportedRates, &sz); + ie =rtw_set_ie (ie,WLAN_EID_SUPP_RATES , rateLen, pdev_network->SupportedRates, &sz); }/* DS parameter set */
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +12 -12
@@ -1271,7 +1271,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) goto OnAssocReqFail;/* check if the supported rate is ok */ - p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + ie_offset, _SUPPORTEDRATES_IE_, &ie_len, pkt_len -WLAN_HDR_A3_LEN - ie_offset); + p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + ie_offset,WLAN_EID_SUPP_RATES , &ie_len, pkt_len -WLAN_HDR_A3_LEN - ie_offset);if (p ==NULL ) {DBG_871X ("Rx a sta assoc-req which supported rate is empty!\n" );/* use our own rate set as statoin used */
@@ -2540,7 +2540,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)/* 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, &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , ((rate_len >8 ) ?8 : rate_len), cur_network->SupportedRates, &pattrib->pktlen);/* DS parameter set */ pframe =rtw_set_ie (pframe, _DSSET_IE_,1 , (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen);
@@ -2744,7 +2744,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p/* 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, &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , ((rate_len >8 ) ?8 : rate_len), cur_network->SupportedRates, &pattrib->pktlen);/* DS parameter set */ pframe =rtw_set_ie (pframe, _DSSET_IE_,1 , (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen);
@@ -2877,10 +2877,10 @@ static int _issue_probereq(struct adapter *padapter,get_rate_set (padapter, bssrate, &bssrate_len);if (bssrate_len >8 ) { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , bssrate, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES ,8 , bssrate, &(pattrib->pktlen)); pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (bssrate_len -8 ), (bssrate +8 ), &(pattrib->pktlen)); }else { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, bssrate_len, bssrate, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , bssrate_len, bssrate, &(pattrib->pktlen)); }if (ch)
@@ -3153,9 +3153,9 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i pframe =rtw_set_fixed_ie (pframe, _ASOC_ID_, (unsigned char *)&le_tmp, &(pattrib->pktlen));if (pstat->bssratelen <=8 ) { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, pstat->bssratelen, pstat->bssrateset, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , pstat->bssratelen, pstat->bssrateset, &(pattrib->pktlen)); }else { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , pstat->bssrateset, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES ,8 , pstat->bssrateset, &(pattrib->pktlen)); pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (pstat->bssratelen-8 ), pstat->bssrateset+8 , &(pattrib->pktlen)); }
@@ -3340,10 +3340,10 @@ void issue_assocreq(struct adapter *padapter)if (bssrate_len >8 ) { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , bssrate, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES ,8 , bssrate, &(pattrib->pktlen)); pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (bssrate_len -8 ), (bssrate +8 ), &(pattrib->pktlen)); }else - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, bssrate_len, bssrate, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , bssrate_len, bssrate, &(pattrib->pktlen));/* vendor specific IE, such as WPA, WMM, WPS */ for (i =sizeof (struct ndis_802_11_fix_ie ); i < pmlmeinfo->network.IELength;) {
@@ -4484,7 +4484,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str/* checking rate info... */ i =0 ; - p =rtw_get_ie (bssid->IEs + ie_offset, _SUPPORTEDRATES_IE_, &len, bssid->IELength - ie_offset); + p =rtw_get_ie (bssid->IEs + ie_offset,WLAN_EID_SUPP_RATES , &len, bssid->IELength - ie_offset);if (p) {if (len >NDIS_802_11_LENGTH_RATES_EX ) {DBG_871X ("%s()-%d: IE too long (%d) for survey event\n" , __func__, __LINE__, len);
@@ -5966,9 +5966,9 @@ static int rtw_auto_ap_start_beacon(struct adapter *adapter)rtw_set_supported_rate (supportRate, wireless_mode); rateLen =rtw_get_rateset_len (supportRate);if (rateLen >8 ) { - ie =rtw_set_ie (ie, _SUPPORTEDRATES_IE_,8 , supportRate, &sz); + ie =rtw_set_ie (ie,WLAN_EID_SUPP_RATES ,8 , supportRate, &sz); }else { - ie =rtw_set_ie (ie, _SUPPORTEDRATES_IE_, rateLen, supportRate, &sz); + ie =rtw_set_ie (ie,WLAN_EID_SUPP_RATES , rateLen, supportRate, &sz); }
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -1
@@ -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))
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +3 -3
@@ -179,7 +179,7 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)/* 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);
@@ -700,10 +700,10 @@ static void ConstructProbeReq(struct adapter *padapter, u8 *pframe, u32 *pLengthget_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,WLAN_EID_SUPP_RATES ,8 , bssrate, &pktlen); pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (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; }
drivers/staging/rtl8723bs/include/wifi.h +0 -1
@@ -387,7 +387,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _FIXED_IE_LENGTH_ _BEACON_IE_OFFSET_ -#define _SUPPORTEDRATES_IE_ 1#define _DSSET_IE_ 3#define _TIM_IE_ 5#define _IBSS_PARA_IE_ 6
Signature · 1 line
2.25.1
PATCH v2 8/21 staging: rtl8723bs: replace _DSSET_IE_
In reply to Ross SchmidtReplace unique _DSSET_IE_ macro with kernel provdied WLAN_EID_DS_PARAMS from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 2 +- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 10 +++++----- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 2 +- drivers/staging/rtl8723bs/include/wifi.h | 1 - 6 files changed, 9 insertions(+), 10 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +1 -1
@@ -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 )
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +1 -1
@@ -350,7 +350,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv) }/* DS parameter set */ - ie =rtw_set_ie (ie, _DSSET_IE_,1 , (u8 *)&(pdev_network->Configuration.DSConfig), &sz); + ie =rtw_set_ie (ie,WLAN_EID_DS_PARAMS ,1 , (u8 *)&(pdev_network->Configuration.DSConfig), &sz);/* IBSS Parameter Set */
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +5 -5
@@ -2543,7 +2543,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , ((rate_len >8 ) ?8 : rate_len), cur_network->SupportedRates, &pattrib->pktlen);/* DS parameter set */ - pframe =rtw_set_ie (pframe, _DSSET_IE_,1 , (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_DS_PARAMS ,1 , (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen);/* if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) */ {
@@ -2747,7 +2747,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , ((rate_len >8 ) ?8 : rate_len), cur_network->SupportedRates, &pattrib->pktlen);/* DS parameter set */ - pframe =rtw_set_ie (pframe, _DSSET_IE_,1 , (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_DS_PARAMS ,1 , (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen);if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_ADHOC_STATE ) {u8 erpinfo =0 ;
@@ -2884,7 +2884,7 @@ static int _issue_probereq(struct adapter *padapter, }if (ch) - pframe =rtw_set_ie (pframe, _DSSET_IE_,1 , &ch, &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_DS_PARAMS ,1 , &ch, &pattrib->pktlen);if (append_wps) {/* add wps_ie for wps2.0 */
@@ -4509,7 +4509,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, strreturn _FAIL;/* Checking for DSConfig */ - p =rtw_get_ie (bssid->IEs + ie_offset, _DSSET_IE_, &len, bssid->IELength - ie_offset); + p =rtw_get_ie (bssid->IEs + ie_offset,WLAN_EID_DS_PARAMS , &len, bssid->IELength - ie_offset); bssid->Configuration.DSConfig =0 ; bssid->Configuration.Length =0 ;
@@ -5982,7 +5982,7 @@ static int rtw_auto_ap_start_beacon(struct adapter *adapter) }else { oper_channel =adapter_to_dvobj (adapter)->oper_channel; } - ie =rtw_set_ie (ie, _DSSET_IE_,1 , &oper_channel, &sz); + ie =rtw_set_ie (ie,WLAN_EID_DS_PARAMS ,1 , &oper_channel, &sz);/* ext supported rates */ if (rateLen >8 ) {
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -1
@@ -1321,7 +1321,7 @@ 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 */
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +1 -1
@@ -182,7 +182,7 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength) 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;
drivers/staging/rtl8723bs/include/wifi.h +0 -1
@@ -387,7 +387,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _FIXED_IE_LENGTH_ _BEACON_IE_OFFSET_ -#define _DSSET_IE_ 3#define _TIM_IE_ 5#define _IBSS_PARA_IE_ 6#define _COUNTRY_IE_ 7
Signature · 1 line
2.25.1
PATCH v2 9/21 staging: rtl8723bs: replace _TIM_IE_
In reply to Ross SchmidtReplace unique _TIM_IE_ macro with kernel provided WLAN_EID_DS_PARAMS from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 10 +++++----- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_xmit.c | 8 ++++---- drivers/staging/rtl8723bs/include/wifi.h | 1 - 5 files changed, 12 insertions(+), 13 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +5 -5
@@ -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_ );
@@ -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 ;
@@ -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 */
@@ -1762,7 +1762,7 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)break ; -case _TIM_IE_: +case WLAN_EID_TIM :update_BCNTIM (padapter);
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -1
@@ -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_recv.c +2 -2
@@ -1158,7 +1158,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); */
@@ -1184,7 +1184,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_xmit.c +4 -4
@@ -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/include/wifi.h +0 -1
@@ -387,7 +387,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _FIXED_IE_LENGTH_ _BEACON_IE_OFFSET_ -#define _TIM_IE_ 5#define _IBSS_PARA_IE_ 6#define _COUNTRY_IE_ 7#define _CHLGETXT_IE_ 16
Signature · 1 line
2.25.1
PATCH v2 10/21 staging: rtl8723bs: replace _IBSS_PARA_IE_
In reply to Ross SchmidtReplace unique _IBSS_PARA_IE_ macro with kernel provided WLAN_EID_IBSS_PARAMS from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 2 +- drivers/staging/rtl8723bs/include/wifi.h | 1 - 4 files changed, 4 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +1 -1
@@ -354,7 +354,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)/* IBSS Parameter Set */ - ie =rtw_set_ie (ie, _IBSS_PARA_IE_,2 , (u8 *)&(pdev_network->Configuration.ATIMWindow), &sz); + ie =rtw_set_ie (ie,WLAN_EID_IBSS_PARAMS ,2 , (u8 *)&(pdev_network->Configuration.ATIMWindow), &sz);if (rateLen >8 ) { ie =rtw_set_ie (ie, _EXT_SUPPORTEDRATES_IE_, (rateLen -8 ), (pdev_network->SupportedRates +8 ), &sz);
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +2 -2
@@ -2552,7 +2552,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)/* IBSS Parameter Set... */ /* ATIMWindow = cur->Configuration.ATIMWindow; */ ATIMWindow =0 ; - pframe =rtw_set_ie (pframe, _IBSS_PARA_IE_,2 , (unsigned char *)(&ATIMWindow), &pattrib->pktlen); + 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);
@@ -2755,7 +2755,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p/* IBSS Parameter Set... */ /* ATIMWindow = cur->Configuration.ATIMWindow; */ ATIMWindow =0 ; - pframe =rtw_set_ie (pframe, _IBSS_PARA_IE_,2 , (unsigned char *)(&ATIMWindow), &pattrib->pktlen); + 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);
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +1 -1
@@ -189,7 +189,7 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)/* 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); }
drivers/staging/rtl8723bs/include/wifi.h +0 -1
@@ -387,7 +387,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _FIXED_IE_LENGTH_ _BEACON_IE_OFFSET_ -#define _IBSS_PARA_IE_ 6#define _COUNTRY_IE_ 7#define _CHLGETXT_IE_ 16#define _SUPPORTED_CH_IE_ 36
Signature · 1 line
2.25.1
PATCH v2 11/21 staging: rtl8723bs: replace _COUNTRY_IE_
In reply to Ross SchmidtReplace unique _COUNTRY_IE_ macro with kernel provided WLAN_EID_COUNTRY from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723bs/include/wifi.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
@@ -4788,7 +4788,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssidu8 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 )
drivers/staging/rtl8723bs/include/wifi.h +0 -1
@@ -387,7 +387,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _FIXED_IE_LENGTH_ _BEACON_IE_OFFSET_ -#define _COUNTRY_IE_ 7#define _CHLGETXT_IE_ 16#define _SUPPORTED_CH_IE_ 36#define _CH_SWTICH_ANNOUNCE_ 37/* Secondary Channel Offset */
Signature · 1 line
2.25.1
PATCH v2 12/21 staging: rtl8723bs: replace _CHLGETXT_IE_
In reply to Ross SchmidtReplace unique _CHLGETXT_IE_ macro with kernel provided WLAN_EID_CHALLENGE from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 8 ++++---- drivers/staging/rtl8723bs/include/wifi.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +4 -4
@@ -1028,7 +1028,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)/* checking for challenging txt... */ DBG_871X ("checking for challenging txt...\n" ); - p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN +4 + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, (int *)&ie_len, + p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN +4 + _AUTH_IE_OFFSET_,WLAN_EID_CHALLENGE , (int *)&ie_len, len -WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ -4 );if ((p ==NULL ) || (ie_len <=0 )) {
@@ -1124,7 +1124,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_framif (seq ==2 ) {if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) {/* legendary shared system */ - p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, (int *)&len, + p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_,WLAN_EID_CHALLENGE , (int *)&len, pkt_len -WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_);if (p ==NULL ) {
@@ -3026,7 +3026,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short/* added challenging text... */ if ((psta->auth_seq ==2 ) && (psta->state &WIFI_FW_AUTH_STATE ) && (use_shared_key ==1 )) - pframe =rtw_set_ie (pframe, _CHLGETXT_IE_,128 , psta->chg_txt, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_CHALLENGE ,128 , psta->chg_txt, &(pattrib->pktlen)); }else {memcpy (pwlanhdr->addr1,get_my_bssid (&pmlmeinfo->network),ETH_ALEN );
@@ -3066,7 +3066,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short/* then checking to see if sending challenging text... */ if ((pmlmeinfo->auth_seq ==3 ) && (pmlmeinfo->state &WIFI_FW_AUTH_STATE ) && (use_shared_key ==1 )) { - pframe =rtw_set_ie (pframe, _CHLGETXT_IE_,128 , pmlmeinfo->chg_txt, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_CHALLENGE ,128 , pmlmeinfo->chg_txt, &(pattrib->pktlen));SetPrivacy (fctrl);
drivers/staging/rtl8723bs/include/wifi.h +0 -1
@@ -387,7 +387,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _FIXED_IE_LENGTH_ _BEACON_IE_OFFSET_ -#define _CHLGETXT_IE_ 16#define _SUPPORTED_CH_IE_ 36#define _CH_SWTICH_ANNOUNCE_ 37/* Secondary Channel Offset */ #define _ERPINFO_IE_ 42
Signature · 1 line
2.25.1
PATCH v2 13/21 staging: rtl8723bs: replace _ERPINFO_IE_
In reply to Ross SchmidtReplace unique _ERPINFO_IE_ macro with kernel provided WLAN_EID_ERP_INFO from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 12 ++++++------ drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 6 +++--- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/include/wifi.h | 1 - 5 files changed, 11 insertions(+), 12 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +6 -6
@@ -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); } }
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +3 -3
@@ -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); }
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -1
@@ -1479,7 +1479,7 @@ void update_beacon_info(struct adapter *padapter, u8 *pframe, uint pkt_len, strubwmode_update_check (padapter, pIE);break ; -case _ERPINFO_IE_: +case WLAN_EID_ERP_INFO :ERP_IE_handler (padapter, pIE);VCS_update (padapter, psta);break ;
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -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 {
drivers/staging/rtl8723bs/include/wifi.h +0 -1
@@ -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
Signature · 1 line
2.25.1
PATCH v2 14/21 staging: rtl8723bs: replace _EXT_SUPPORTEDRATES_IE_
In reply to Ross SchmidtReplace unique _EXT_SUPPORTEDRATES_IE_ macro with kernel provided WLAN_EID_EXT_SUPP_RATES from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 2 +- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 18 +++++++++--------- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 4 ++-- drivers/staging/rtl8723bs/include/wifi.h | 1 - 6 files changed, 15 insertions(+), 16 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +1 -1
@@ -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_ );
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +2 -2
@@ -344,7 +344,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)if (rateLen >8 ) { ie =rtw_set_ie (ie,WLAN_EID_SUPP_RATES ,8 , pdev_network->SupportedRates, &sz); -/* ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz); */ +/* ie = rtw_set_ie(ie, WLAN_EID_EXT_SUPP_RATES, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz); */ }else { ie =rtw_set_ie (ie,WLAN_EID_SUPP_RATES , rateLen, pdev_network->SupportedRates, &sz); }
@@ -357,7 +357,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv) ie =rtw_set_ie (ie,WLAN_EID_IBSS_PARAMS ,2 , (u8 *)&(pdev_network->Configuration.ATIMWindow), &sz);if (rateLen >8 ) { - ie =rtw_set_ie (ie, _EXT_SUPPORTEDRATES_IE_, (rateLen -8 ), (pdev_network->SupportedRates +8 ), &sz); + ie =rtw_set_ie (ie,WLAN_EID_EXT_SUPP_RATES , (rateLen -8 ), (pdev_network->SupportedRates +8 ), &sz); }/* HT Cap. */
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +9 -9
@@ -783,7 +783,7 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)u8 *p =NULL ;u32 ielen =0 ; - p =rtw_get_ie (pframe +sizeof (struct ieee80211_hdr_3addr ) + _BEACON_IE_OFFSET_, _EXT_SUPPORTEDRATES_IE_, &ielen, precv_frame->u.hdr.len -sizeof (struct ieee80211_hdr_3addr ) - _BEACON_IE_OFFSET_); + p =rtw_get_ie (pframe +sizeof (struct ieee80211_hdr_3addr ) + _BEACON_IE_OFFSET_,WLAN_EID_EXT_SUPP_RATES , &ielen, precv_frame->u.hdr.len -sizeof (struct ieee80211_hdr_3addr ) - _BEACON_IE_OFFSET_);if (p && ielen >0 ) {if ((*(p +1 + ielen) ==0x2D ) && (*(p +2 + ielen) !=0x2D )) {/* Invalid value 0x2D is detected in Extended Supported Rates (ESR) IE. Try to fix the IE length to avoid failed Beacon parsing. */
@@ -1284,7 +1284,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)memcpy (supportRate, p+2 , ie_len); supportRateNum = ie_len; - p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + ie_offset, _EXT_SUPPORTEDRATES_IE_, &ie_len, + p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + ie_offset,WLAN_EID_EXT_SUPP_RATES , &ie_len, pkt_len -WLAN_HDR_A3_LEN - ie_offset);if (p !=NULL ) {
@@ -2561,7 +2561,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)/* EXTERNDED SUPPORTED RATE */ if (rate_len >8 ) { - pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (rate_len -8 ), (cur_network->SupportedRates +8 ), &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , (rate_len -8 ), (cur_network->SupportedRates +8 ), &pattrib->pktlen); }
@@ -2764,7 +2764,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p/* EXTERNDED SUPPORTED RATE */ if (rate_len >8 ) { - pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (rate_len -8 ), (cur_network->SupportedRates +8 ), &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , (rate_len -8 ), (cur_network->SupportedRates +8 ), &pattrib->pktlen); }
@@ -2878,7 +2878,7 @@ static int _issue_probereq(struct adapter *padapter,if (bssrate_len >8 ) { pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES ,8 , bssrate, &(pattrib->pktlen)); - pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (bssrate_len -8 ), (bssrate +8 ), &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , (bssrate_len -8 ), (bssrate +8 ), &(pattrib->pktlen)); }else { pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , bssrate_len, bssrate, &(pattrib->pktlen)); }
@@ -3156,7 +3156,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , pstat->bssratelen, pstat->bssrateset, &(pattrib->pktlen)); }else { pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES ,8 , pstat->bssrateset, &(pattrib->pktlen)); - pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (pstat->bssratelen-8 ), pstat->bssrateset+8 , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , (pstat->bssratelen-8 ), pstat->bssrateset+8 , &(pattrib->pktlen)); }if ((pstat->flags &WLAN_STA_HT ) && (pmlmepriv->htpriv.ht_option)) {
@@ -3341,7 +3341,7 @@ void issue_assocreq(struct adapter *padapter)if (bssrate_len >8 ) { pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES ,8 , bssrate, &(pattrib->pktlen)); - pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (bssrate_len -8 ), (bssrate +8 ), &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , (bssrate_len -8 ), (bssrate +8 ), &(pattrib->pktlen)); }else pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , bssrate_len, bssrate, &(pattrib->pktlen));
@@ -4494,7 +4494,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str i = len; } - p =rtw_get_ie (bssid->IEs + ie_offset, _EXT_SUPPORTEDRATES_IE_, &len, bssid->IELength - ie_offset); + p =rtw_get_ie (bssid->IEs + ie_offset,WLAN_EID_EXT_SUPP_RATES , &len, bssid->IELength - ie_offset);if (p) {if (len > (NDIS_802_11_LENGTH_RATES_EX -i)) {DBG_871X ("%s()-%d: IE too long (%d) for survey event\n" , __func__, __LINE__, len);
@@ -5986,7 +5986,7 @@ static int rtw_auto_ap_start_beacon(struct adapter *adapter)/* ext supported rates */ if (rateLen >8 ) { - ie =rtw_set_ie (ie, _EXT_SUPPORTEDRATES_IE_, (rateLen -8 ), (supportRate +8 ), &sz); + ie =rtw_set_ie (ie,WLAN_EID_EXT_SUPP_RATES , (rateLen -8 ), (supportRate +8 ), &sz); }DBG_871X ("%s, start auto ap beacon sz =%d\n" , __func__, sz);
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -1
@@ -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/hal/rtl8723b_cmd.c +2 -2
@@ -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 */
@@ -701,7 +701,7 @@ static void ConstructProbeReq(struct adapter *padapter, u8 *pframe, u32 *pLengthif (bssrate_len >8 ) { pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES ,8 , bssrate, &pktlen); - pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (bssrate_len -8 ), (bssrate +8 ), &pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , (bssrate_len -8 ), (bssrate +8 ), &pktlen); }else pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , bssrate_len, bssrate, &pktlen);
drivers/staging/rtl8723bs/include/wifi.h +0 -1
@@ -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 _EXT_SUPPORTEDRATES_IE_ 50#define _FTIE_ 55#define _TIMEOUT_ITVL_IE_ 56
Signature · 1 line
2.25.1
PATCH v2 15/21 staging: rtl8723bs: replace _WAPI_IE_
In reply to Ross SchmidtReplace unique _WAPI_IE_ macro with kernel provided WLAN_EID_BSS_AC_ACCESS_DELAY from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 4 ++-- drivers/staging/rtl8723bs/include/wifi.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +2 -2
@@ -623,8 +623,8 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len)while (cnt < in_len) { authmode = in_ie[cnt]; -/* if (authmode == _WAPI_IE_) */ -if (authmode == _WAPI_IE_ && (!memcmp (&in_ie[cnt+6 ], wapi_oui1,4 ) || +/* if (authmode == WLAN_EID_BSS_AC_ACCESS_DELAY) */ +if (authmode ==WLAN_EID_BSS_AC_ACCESS_DELAY && (!memcmp (&in_ie[cnt+6 ], wapi_oui1,4 ) || !memcmp (&in_ie[cnt+6 ], wapi_oui2,4 ))) {if (wapi_ie) {memcpy (wapi_ie, &in_ie[cnt], in_ie[cnt+1 ]+2 );
drivers/staging/rtl8723bs/include/wifi.h +0 -1
@@ -393,7 +393,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _FTIE_ 55#define _TIMEOUT_ITVL_IE_ 56#define _SRC_IE_ 59 -#define _WAPI_IE_ 68#define _RIC_Descriptor_IE_ 75#define _MME_IE_ 76/* 802.11w Management MIC element */
Signature · 1 line
2.25.1
PATCH v2 16/21 staging: rtl8723bs: replace _MME_IE_
In reply to Ross SchmidtReplace unique _MME_IE_ macro with kernel provided WLAN_EID_MMIE from linux/ieee80211.h.
--- 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(-)
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_xmit.c +1 -1
@@ -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 */
drivers/staging/rtl8723bs/include/wifi.h +0 -1
@@ -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
Signature · 1 line
2.25.1
PATCH v2 17/21 staging: rtl8723bs: replace EID_BSSCoexistence
In reply to Ross SchmidtReplace unique EID_BSSCoexistence constant with kernel provided WLAN_EID_BSS_COEX_2040 from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
@@ -4096,7 +4096,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) iedata |=BIT (2 );/* 20 MHz BSS Width Request */ - pframe =rtw_set_ie (pframe, EID_BSSCoexistence,1 , &iedata, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_BSS_COEX_2040 ,1 , &iedata, &(pattrib->pktlen)); }
Signature · 1 line
2.25.1
PATCH v2 18/21 staging: rtl8723bs: replace EID_BSSIntolerantChlReport
In reply to Ross SchmidtReplace unique EID_BSSIntolerantChlReport constant with kernel provided WLAN_EID_BSS_INTOLERANT_CHL_REPORT from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
@@ -4160,7 +4160,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) } } - pframe =rtw_set_ie (pframe, EID_BSSIntolerantChlReport, k, InfoContent, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_BSS_INTOLERANT_CHL_REPORT , k, InfoContent, &(pattrib->pktlen)); }
Signature · 1 line
2.25.1
PATCH v2 19/21 staging: rtl8723bs: replace EID_EXTCapability
In reply to Ross SchmidtReplace unique EID_EXTCapability constant with kernel provided WLAN_EID_EXT_CAPABILITY from linux/ieee80211.h.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1
@@ -2912,7 +2912,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 +2 -2
@@ -3381,9 +3381,9 @@ void issue_assocreq(struct adapter *padapter) }break ; -case EID_EXTCapability: +case WLAN_EID_EXT_CAPABILITY :if (padapter->mlmepriv.htpriv.ht_option) - pframe =rtw_set_ie (pframe, EID_EXTCapability, pIE->Length, pIE->data, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_EXT_CAPABILITY , pIE->Length, pIE->data, &(pattrib->pktlen));break ;default :break ;
Signature · 1 line
2.25.1
PATCH v2 20/21 staging: rtl8723bs: remove unused macros
In reply to Ross SchmidtRemove many macros from wifi.h and ieee80211.h because they are unused.
--- drivers/staging/rtl8723bs/include/ieee80211.h | 5 ----- drivers/staging/rtl8723bs/include/wifi.h | 15 --------------- 2 files changed, 20 deletions(-)
drivers/staging/rtl8723bs/include/ieee80211.h +0 -5
@@ -348,11 +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_20_40_BSS_COEXISTENCE 72 -#define WLAN_EID_20_40_BSS_INTOLERANT 73 -#define WLAN_EID_OVERLAPPING_BSS_SCAN_PARAMS 74 -#define IEEE80211_MGMT_HDR_LEN 24#define IEEE80211_DATA_HDR3_LEN 24#define IEEE80211_DATA_HDR4_LEN 30
drivers/staging/rtl8723bs/include/wifi.h +0 -15
@@ -387,21 +387,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _FIXED_IE_LENGTH_ _BEACON_IE_OFFSET_ -#define _SUPPORTED_CH_IE_ 36 -#define _CH_SWTICH_ANNOUNCE_ 37/* Secondary Channel Offset */ - -#define _FTIE_ 55 -#define _TIMEOUT_ITVL_IE_ 56 -#define _SRC_IE_ 59 - -#define _RIC_Descriptor_IE_ 75 -#define _LINK_ID_IE_ 101 -#define _CH_SWITCH_TIMING_ 104 -#define _PTI_BUFFER_STATUS_ 106 -#define _EXT_CAP_IE_ 127 - -#define _RESERVED47_ 47 -enum ELEMENT_ID { EID_SsId =0 ,/* service set identifier (0:32) */ EID_SupRates =1 ,/* supported rates (1:8) */
Signature · 1 line
2.25.1
PATCH v2 21/21 staging: rtl8723bs: remove ELEMENT_ID enum
In reply to Ross SchmidtThe ELEMENT_ID enum is no longer used, remove it.
--- drivers/staging/rtl8723bs/include/wifi.h | 76 ------------------------ 1 file changed, 76 deletions(-)
drivers/staging/rtl8723bs/include/wifi.h +0 -76
@@ -387,82 +387,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _FIXED_IE_LENGTH_ _BEACON_IE_OFFSET_ -enum ELEMENT_ID { - EID_SsId =0 ,/* service set identifier (0:32) */ - EID_SupRates =1 ,/* supported rates (1:8) */ - EID_FHParms =2 ,/* FH parameter set (5) */ - EID_DSParms =3 ,/* DS parameter set (1) */ - EID_CFParms =4 ,/* CF parameter set (6) */ - EID_Tim =5 ,/* Traffic Information Map (4:254) */ - EID_IbssParms =6 ,/* IBSS parameter set (2) */ - EID_Country =7 ,/* */ - -/* Form 7.3.2: Information elements in 802.11E/D13.0, page 46. */ - EID_QBSSLoad =11 , - EID_EDCAParms =12 , - EID_TSpec =13 , - EID_TClass =14 , - EID_Schedule =15 , -/* */ - - EID_Ctext =16 ,/* challenge text*/ -EID_POWER_CONSTRAINT =32 ,/* Power Constraint*/ - -/* vivi for WIFITest, 802.11h AP, 20100427 */ -/* 2010/12/26 MH The definition we can declare always!! */ - EID_PowerCap =33 , - EID_SupportedChannels =36 , - EID_ChlSwitchAnnounce =37 , - - EID_MeasureRequest =38 ,/* Measurement Request */ - EID_MeasureReport =39 ,/* Measurement Report */ - - EID_ERPInfo =42 , - -/* Form 7.3.2: Information elements in 802.11E/D13.0, page 46. */ - EID_TSDelay =43 , - EID_TCLASProc =44 , - EID_HTCapability =45 , - EID_QoSCap =46 , -/* */ - -EID_WPA2 =48 , - EID_ExtSupRates =50 , - -EID_FTIE =55 ,/* Defined in 802.11r */ - EID_Timeout =56 ,/* Defined in 802.11r */ - - EID_SupRegulatory =59 ,/* Supported Requlatory Classes 802.11y */ - EID_HTInfo =61 , - EID_SecondaryChnlOffset =62 , - - EID_BSSCoexistence =72 ,/* 20/40 BSS Coexistence */ - EID_BSSIntolerantChlReport =73 , -EID_OBSS =74 ,/* Overlapping BSS Scan Parameters */ - - EID_LinkIdentifier =101 ,/* Defined in 802.11z */ - EID_WakeupSchedule =102 ,/* Defined in 802.11z */ - EID_ChnlSwitchTimeing =104 ,/* Defined in 802.11z */ - EID_PTIControl =105 ,/* Defined in 802.11z */ - EID_PUBufferStatus =106 ,/* Defined in 802.11z */ - - EID_EXTCapability =127 ,/* Extended Capabilities */ -/* From S19:Aironet IE and S21:AP IP address IE in CCX v1.13, p16 and p18. */ - EID_Aironet =133 ,/* 0x85: Aironet Element for Cisco CCX */ - EID_CiscoIP =149 ,/* 0x95: IP Address IE for Cisco CCX */ - - EID_CellPwr =150 ,/* 0x96: Cell Power Limit IE. Ref. 0x96. */ - -EID_CCKM =156 , - - EID_Vendor =221 ,/* 0xDD: Vendor Specific */ - -EID_WAPI =68 , - EID_VHTCapability =191 ,/* Based on 802.11ac D2.0 */ - EID_VHTOperation =192 ,/* Based on 802.11ac D2.0 */ - EID_OpModeNotification =199 ,/* Based on 802.11ac D3.0 */ -}; -/* --------------------------------------------------------------------------- Below is the fixed elements... -----------------------------------------------------------------------------*/
Signature · 1 line
2.25.1