Fixes checkpatch warnings and checks
PATCH 1/1 Fixes checkpatch warnings and checks
Fixes checkpatch warningds and checks
Signed-off-by Simone Serra <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 462 +++++++++++------------- 1 file changed, 220 insertions(+), 242 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +220 -242
@@ -259,9 +259,9 @@ void expire_timeout_chk(struct adapter *padapter) }else {/* TODO: Aging mechanism to digest frames in sleep_q to */ /* avoid running out of xmitframe */ -if (psta->sleepq_len > (NR_XMITFRAME / pstapriv->asoc_list_cnt) - && padapter->xmitpriv.free_xmitframe_cnt < (( -NR_XMITFRAME / pstapriv->asoc_list_cnt +if (psta->sleepq_len > (NR_XMITFRAME / pstapriv->asoc_list_cnt) && + padapter->xmitpriv.free_xmitframe_cnt < + ((NR_XMITFRAME / pstapriv->asoc_list_cnt ) /2 ) )wakeup_sta_to_xmit (padapter, psta);
@@ -277,7 +277,7 @@ void expire_timeout_chk(struct adapter *padapter)/* switch to correct channel of current network before issue keep-alive frames */ if (rtw_get_oper_ch (padapter) != pmlmeext->cur_channel) { backup_oper_channel =rtw_get_oper_ch (padapter); -SelectChannel (padapter, pmlmeext->cur_channel); +select_channel (padapter, pmlmeext->cur_channel); }/* issue null data to check sta alive*/
@@ -315,17 +315,17 @@ void expire_timeout_chk(struct adapter *padapter) }if (backup_oper_channel >0 )/* back to the original operation channel */ -SelectChannel (padapter, backup_oper_channel); +select_channel (padapter, backup_oper_channel); }associated_clients_update (padapter, updated); } -void add_RATid (struct adapter *padapter,struct sta_info *psta,u8 rssi_level) +void add_ratid (struct adapter *padapter,struct sta_info *psta,u8 rssi_level) { -unsigned char sta_band =0 , shortGIrate = false; +unsigned char sta_band =0 , short_gi_rate = false;unsigned int tx_ra_bitmap =0 ; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_bssid_ex *pcur_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
@@ -338,7 +338,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)rtw_hal_update_sta_rate_mask (padapter, psta); tx_ra_bitmap = psta->ra_mask; - shortGIrate =query_ra_short_GI (psta); + short_gi_rate =query_ra_short_GI (psta);if (pcur_network->configuration.ds_config >14 ) { sta_band |=WIRELESS_INVALID ;
@@ -361,7 +361,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level) arg[0 ] = psta->mac_id; arg[1 ] = psta->raid; - arg[2 ] = shortGIrate; + arg[2 ] = short_gi_rate; arg[3 ] = psta->init_rate;rtw_hal_add_ra_tid (padapter, tx_ra_bitmap, arg, rssi_level);
@@ -371,11 +371,11 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)void update_bmc_sta (struct adapter *padapter) {unsigned char network_type; -int supportRateNum =0 ; +int support_rate_num =0 ;unsigned int tx_ra_bitmap =0 ; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct wlan_bssid_ex *pcur_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;struct sta_info *psta =rtw_get_bcmc_stainfo (padapter);
@@ -394,12 +394,10 @@ void update_bmc_sta(struct adapter *padapter)memset ((void *)&psta->sta_stats,0 ,sizeof (struct stainfo_stats )); -/* psta->dot118021XPrivacy = _NO_PRIVACY_;//!!! remove it, because it has been set before this. */ -/* prepare for add_RATid */ - supportRateNum =rtw_get_rateset_len ((u8 *)&pcur_network->supported_rates); + support_rate_num =rtw_get_rateset_len ((u8 *)&pcur_network->supported_rates); network_type =rtw_check_network_type ((u8 *)&pcur_network->supported_rates, - supportRateNum, + support_rate_num, pcur_network->configuration.ds_config );if (is_supported_tx_cck (network_type)) {
@@ -439,7 +437,6 @@ void update_bmc_sta(struct adapter *padapter)spin_lock_bh (&psta->lock); psta->state = _FW_LINKED;spin_unlock_bh (&psta->lock); - } }
@@ -452,9 +449,9 @@ void update_bmc_sta(struct adapter *padapter)void update_sta_info_apmode (struct adapter *padapter,struct sta_info *psta) { -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct security_priv *psecuritypriv = &padapter->securitypriv; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv;struct ht_priv *phtpriv_sta = &psta->htpriv;u8 cur_ldpc_cap =0 , cur_stbc_cap =0 , cur_beamform_cap =0 ;
@@ -468,7 +465,7 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)/* ap mode */ rtw_hal_set_odm_var (padapter,HAL_ODM_STA_INFO , psta, true); -if (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) +if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021X) psta->ieee8021x_blocked = true;else psta->ieee8021x_blocked = false;
@@ -483,13 +480,12 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)/* check if sta supports rx ampdu */ phtpriv_sta->ampdu_enable = phtpriv_ap->ampdu_enable; - phtpriv_sta->rx_ampdu_min_spacing = ( - phtpriv_sta->ht_cap.ampdu_params_info &IEEE80211_HT_CAP_AMPDU_DENSITY + phtpriv_sta->rx_ampdu_min_spacing = + (phtpriv_sta->ht_cap.ampdu_params_info &IEEE80211_HT_CAP_AMPDU_DENSITY ) >>2 ;/* bwmode */ -if (( - phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info +if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info ) &cpu_to_le16 (IEEE80211_HT_CAP_SUP_WIDTH )) psta->bw_mode =CHANNEL_WIDTH_40 ;else
@@ -501,14 +497,12 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta) phtpriv_sta->ch_offset = pmlmeext->cur_ch_offset;/* check if sta support s Short GI 20M */ -if (( - phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info +if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info ) &cpu_to_le16 (IEEE80211_HT_CAP_SGI_20 )) phtpriv_sta->sgi_20m = true;/* check if sta support s Short GI 40M */ -if (( - phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info +if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info ) &cpu_to_le16 (IEEE80211_HT_CAP_SGI_40 )) {if (psta->bw_mode ==CHANNEL_WIDTH_40 )/* according to psta->bw_mode */ phtpriv_sta->sgi_40m = true;
@@ -564,10 +558,10 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)static void update_ap_info (struct adapter *padapter,struct sta_info *psta) { -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv; psta->wireless_mode = pmlmeext->cur_wireless_mode;
@@ -610,7 +604,7 @@ static void update_hw_ht_param(struct adapter *padapter)unsigned char max_AMPDU_len;unsigned char min_MPDU_spacing;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;/* handle A-MPDU parameter field *
@@ -628,8 +622,8 @@ static void update_hw_ht_param(struct adapter *padapter)/* */ /* Config SM Power Save setting */ /* */ - pmlmeinfo->SM_PS = (le16_to_cpu ( - pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info + pmlmeinfo->SM_PS = (le16_to_cpu + (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info ) &0x0C ) >>2 ;/* */
@@ -646,13 +640,13 @@ void start_bss_network(struct adapter *padapter)u32 acparm;int ie_len;struct registry_priv *pregpriv = &padapter->registrypriv; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct security_priv *psecuritypriv = &(padapter->securitypriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct security_priv *psecuritypriv = &padapter->securitypriv;struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork_mlmeext = &(pmlmeinfo->network); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork_mlmeext = &pmlmeinfo->network;struct HT_info_element *pht_info =NULL ;u8 cbw40_enable =0 ;
@@ -662,7 +656,8 @@ void start_bss_network(struct adapter *padapter) cur_ch_offset =HAL_PRIME_CHNL_OFFSET_DONT_CARE ;/* check if there is wps ie, */ -/* if there is wpsie in beacon, the hostapd will update beacon twice when stating hostapd, */ +/* if there is wpsie in beacon, the hostapd will update beacon twice when stating */ +/* hostapd, */ /* and at first time the security ie (RSN/WPA IE) will not include in beacon. */ if (!rtw_get_wps_ie (pnetwork->ies + _FIXED_IE_LENGTH_, pnetwork->ie_length - _FIXED_IE_LENGTH_,NULL ,NULL ))
@@ -685,13 +680,13 @@ void start_bss_network(struct adapter *padapter)if (!pmlmepriv->cur_network.join_res) {/* setting only at first time */ /* WEP Key will be set before this function, do not clear CAM. */ -if ((psecuritypriv->dot11PrivacyAlgrthm != _WEP40_) && - (psecuritypriv->dot11PrivacyAlgrthm != _WEP104_)) +if ((psecuritypriv->dot11_privacy_algrthm != _WEP40_) && + (psecuritypriv->dot11_privacy_algrthm != _WEP104_))flush_all_cam_entry (padapter);/* clear CAM */ }/* set MSR to AP_Mode */ -Set_MSR (padapter, _HW_STATE_AP_); +set_msr (padapter, _HW_STATE_AP_);/* Set BSSID REG */ rtw_hal_set_hwreg (padapter,HW_VAR_BSSID , pnetwork->mac_address);
@@ -708,8 +703,7 @@ void start_bss_network(struct adapter *padapter)rtw_hal_set_hwreg (padapter,HW_VAR_AC_PARAM_BK , (u8 *)(&acparm));/* Set Security */ - val8 = ( - psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X + val8 = (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021X ) ?0xcc :0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8));
@@ -728,7 +722,7 @@ void start_bss_network(struct adapter *padapter)/* Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false); */ /* turn on all dynamic functions */ -Switch_DM_Func (padapter,DYNAMIC_ALL_FUNC_ENABLE , true); +switch_DM_func (padapter,DYNAMIC_ALL_FUNC_ENABLE , true);/* rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); */ }
@@ -786,13 +780,12 @@ void start_bss_network(struct adapter *padapter)update_wireless_mode (padapter);/* update RRSR after set channel and bandwidth */ -UpdateBrateTbl (padapter, pnetwork->supported_rates); +update_brate_tbl (padapter, pnetwork->supported_rates);rtw_hal_set_hwreg (padapter,HW_VAR_BASIC_RATE , pnetwork->supported_rates);/* update capability after cur_wireless_mode updated */ -update_capinfo ( - padapter, -rtw_get_capability ((struct wlan_bssid_ex *)pnetwork) +update_capinfo (padapter, +rtw_get_capability ((struct wlan_bssid_ex *)pnetwork) );if (pmlmeext->bstart_bss) {
@@ -812,19 +805,19 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) {int ret = _SUCCESS;u8 *p; -u8 *pHT_caps_ie =NULL ; -u8 *pHT_info_ie =NULL ; +u8 *pht_caps_ie =NULL ; +u8 *pht_info_ie =NULL ;struct sta_info *psta =NULL ;u16 cap, ht_cap = false;uint ie_len =0 ;int group_cipher, pairwise_cipher; -u8 channel, network_type, supportRate[NDIS_802_11_LENGTH_RATES_EX ]; -int supportRateNum =0 ; +u8 channel, network_type, support_rate[NDIS_802_11_LENGTH_RATES_EX ]; +int support_rate_num =0 ;u8 OUI1 [] = {0x00 ,0x50 ,0xf2 ,0x01 };u8 WMM_PARA_IE [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 };struct registry_priv *pregistrypriv = &padapter->registrypriv;struct security_priv *psecuritypriv = &padapter->securitypriv; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_bssid_ex *pbss_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;u8 *ie = pbss_network->ies;
@@ -841,15 +834,16 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)memcpy (ie, pbuf, pbss_network->ie_length); -if (pbss_network->infrastructure_mode != Ndis802_11APMode) +if (pbss_network->infrastructure_mode != ndis802_11_ap_mode)return _FAIL; pbss_network->rssi =0 ; -memcpy (pbss_network->mac_address,myid (&(padapter->eeprompriv)),ETH_ALEN ); +memcpy (pbss_network->mac_address,myid (&padapter->eeprompriv),ETH_ALEN );/* beacon interval */ - p =rtw_get_beacon_interval_from_ie (ie);/* ie + 8; 8: TimeStamp, 2: Beacon Interval 2:Capability */ + p =rtw_get_beacon_interval_from_ie (ie);/* ie + 8; 8: TimeStamp, */ +/* 2: Beacon Interval 2:Capability */ /* pbss_network->configuration.beacon_period = le16_to_cpu(*(unsigned short*)p); */ pbss_network->configuration.beacon_period =get_unaligned_le16 (p);
@@ -859,11 +853,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) cap =get_unaligned_le16 (ie);/* SSID */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_SSID , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_SSID , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 ) {memset (&pbss_network->ssid,0 ,sizeof (struct ndis_802_11_ssid ));
@@ -874,51 +867,47 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)/* channel */ channel =0 ; pbss_network->configuration.length =0 ; - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_DS_PARAMS , &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_DS_PARAMS , &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 ) channel = *(p +2 ); pbss_network->configuration.ds_config = channel; -memset (supportRate,0 ,NDIS_802_11_LENGTH_RATES_EX ); +memset (support_rate,0 ,NDIS_802_11_LENGTH_RATES_EX );/* get supported rates */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_SUPP_RATES , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_SUPP_RATES , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p) { -memcpy (supportRate, p +2 , ie_len); - supportRateNum = ie_len; +memcpy (support_rate, p +2 , ie_len); + support_rate_num = ie_len; }/* get ext_supported rates */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_EXT_SUPP_RATES , - &ie_len, - pbss_network->ie_length - _BEACON_IE_OFFSET_ + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_EXT_SUPP_RATES , + &ie_len, + pbss_network->ie_length - _BEACON_IE_OFFSET_ );if (p) { -memcpy (supportRate + supportRateNum, p +2 , ie_len); - supportRateNum += ie_len; +memcpy (support_rate + support_rate_num, p +2 , ie_len); + support_rate_num += ie_len; } - network_type =rtw_check_network_type (supportRate, supportRateNum, channel); + network_type =rtw_check_network_type (support_rate, support_rate_num, channel);rtw_set_supported_rate (pbss_network->supported_rates, network_type);/* parsing ERP_IE */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_ERP_INFO , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_ERP_INFO , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 )ERP_IE_handler (padapter, (struct ndis_80211_var_ie *)p);
@@ -935,21 +924,20 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) group_cipher =0 ; pairwise_cipher =0 ; psecuritypriv->wpa2_group_cipher = _NO_PRIVACY_; psecuritypriv->wpa2_pairwise_cipher = _NO_PRIVACY_; - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_RSN , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_RSN , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 ) { -if (rtw_parse_wpa2_ie ( - p, +if (rtw_parse_wpa2_ie + (p, ie_len +2 , &group_cipher, &pairwise_cipher,NULL ) == _SUCCESS) { - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021X; psecuritypriv->dot8021xalg =1 ;/* psk, todo:802.1x */ psecuritypriv->wpa_psk |=BIT (1 );
@@ -965,21 +953,20 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) psecuritypriv->wpa_group_cipher = _NO_PRIVACY_; psecuritypriv->wpa_pairwise_cipher = _NO_PRIVACY_;for (p = ie + _BEACON_IE_OFFSET_; ; p += (ie_len +2 )) { - p =rtw_get_ie ( - p, -WLAN_EID_VENDOR_SPECIFIC , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len +2 )) + p =rtw_get_ie (p, +WLAN_EID_VENDOR_SPECIFIC , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len +2 )) );if ((p) && (!memcmp (p +2 ,OUI1 ,4 ))) { -if (rtw_parse_wpa_ie ( - p, +if (rtw_parse_wpa_ie + (p, ie_len +2 , &group_cipher, &pairwise_cipher,NULL ) == _SUCCESS) { - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021X; psecuritypriv->dot8021xalg =1 ;/* psk, todo:802.1x */
@@ -1001,8 +988,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) pmlmepriv->qospriv.qos_option =0 ;if (pregistrypriv->wmm_enable) {for (p = ie + _BEACON_IE_OFFSET_; ; p += (ie_len +2 )) { - p =rtw_get_ie ( - p, + p =rtw_get_ie + (p,WLAN_EID_VENDOR_SPECIFIC , &ie_len, (pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len + 2))
@@ -1028,8 +1015,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) }/* parsing HT_CAP_IE */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, + p =rtw_get_ie + (ie + _BEACON_IE_OFFSET_,WLAN_EID_HT_CAPABILITY , &ie_len, (pbss_network->ie_length - _BEACON_IE_OFFSET_)
@@ -1038,17 +1025,17 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)u8 max_rx_ampdu_factor =0 ;struct ieee80211_ht_cap *pht_cap = (struct ieee80211_ht_cap *)(p +2 ); - pHT_caps_ie = p; + pht_caps_ie = p; ht_cap = true; network_type |=WIRELESS_11_24N ;rtw_ht_use_default_setting (padapter); -if (pmlmepriv->htpriv.sgi_20m == false) +if (!pmlmepriv->htpriv.sgi_20m) pht_cap->cap_info &=cpu_to_le16 (~(IEEE80211_HT_CAP_SGI_20 )); -if (pmlmepriv->htpriv.sgi_40m == false) +if (!pmlmepriv->htpriv.sgi_40m) pht_cap->cap_info &=cpu_to_le16 (~(IEEE80211_HT_CAP_SGI_40 ));if (!TEST_FLAG (pmlmepriv->htpriv.ldpc_cap,LDPC_HT_ENABLE_RX ))
@@ -1060,8 +1047,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)if (!TEST_FLAG (pmlmepriv->htpriv.stbc_cap,STBC_HT_ENABLE_RX )) pht_cap->cap_info &=cpu_to_le16 (~(IEEE80211_HT_CAP_RX_STBC_3R )); - pht_cap->ampdu_params_info &= ~( -IEEE80211_HT_CAP_AMPDU_FACTOR |IEEE80211_HT_CAP_AMPDU_DENSITY + pht_cap->ampdu_params_info &= + ~(IEEE80211_HT_CAP_AMPDU_FACTOR |IEEE80211_HT_CAP_AMPDU_DENSITY ); if ((psecuritypriv->wpa_pairwise_cipher & WPA_CIPHER_CCMP) ||
@@ -1073,13 +1060,12 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 0x00); } -rtw_hal_get_def_var ( - padapter, -HW_VAR_MAX_RX_AMPDU_FACTOR , - &max_rx_ampdu_factor +rtw_hal_get_def_var (padapter, +HW_VAR_MAX_RX_AMPDU_FACTOR , + &max_rx_ampdu_factor ); - pht_cap->ampdu_params_info |= ( -IEEE80211_HT_CAP_AMPDU_FACTOR & max_rx_ampdu_factor + pht_cap->ampdu_params_info |= + (IEEE80211_HT_CAP_AMPDU_FACTOR & max_rx_ampdu_factor );/* set Max Rx AMPDU size to 64K */ pht_cap->mcs.rx_mask[0 ] =0xff ;
@@ -1089,27 +1075,27 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) }/* parsing HT_INFO_IE */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, + p =rtw_get_ie + (ie + _BEACON_IE_OFFSET_,WLAN_EID_HT_OPERATION , &ie_len, (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 ) - pHT_info_ie = p; + pht_info_ie = p;switch (network_type) {case WIRELESS_11B : - pbss_network->network_type_in_use = Ndis802_11DS; + pbss_network->network_type_in_use = ndis802_11ds;break ;case WIRELESS_11G :case WIRELESS_11BG :case WIRELESS_11G_24N :case WIRELESS_11BG_24N : - pbss_network->network_type_in_use = Ndis802_11OFDM24; + pbss_network->network_type_in_use = ndis802_11ofdm24;break ;default : - pbss_network->network_type_in_use = Ndis802_11OFDM24; + pbss_network->network_type_in_use = ndis802_11ofdm24;break ; }
@@ -1131,13 +1117,13 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)if (pregistrypriv->ampdu_enable ==1 ) pmlmepriv->htpriv.ampdu_enable = true; -HT_caps_handler (padapter, (struct ndis_80211_var_ie *)pHT_caps_ie); +ht_caps_handler (padapter, (struct ndis_80211_var_ie *)pht_caps_ie); -HT_info_handler (padapter, (struct ndis_80211_var_ie *)pHT_info_ie); +ht_info_handler (padapter, (struct ndis_80211_var_ie *)pht_info_ie); } - pbss_network->length =get_wlan_bssid_ex_sz ( - (struct wlan_bssid_ex *)pbss_network + pbss_network->length =get_wlan_bssid_ex_sz + ((struct wlan_bssid_ex *)pbss_network );/* issue beacon to start bss network */
@@ -1155,7 +1141,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)/* update AP's sta info */ update_ap_info (padapter, psta); - psta->state |=WIFI_AP_STATE ;/* Aries, add, fix bug of flush_cam_entry at STOP AP mode , 0724 */ + psta->state |=WIFI_AP_STATE ;/* Aries, add, fix bug of flush_cam_entry */ +/* at STOP AP mode , 0724 */ rtw_indicate_connect (padapter); pmlmepriv->cur_network.join_res = true;/* for check if already set beacon */
@@ -1187,26 +1174,26 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)if ((NUM_ACL -1 ) < pacl_list->num)return (-1 ); -spin_lock_bh (&(pacl_node_q->lock)); +spin_lock_bh (&pacl_node_q->lock); phead =get_list_head (pacl_node_q);list_for_each (plist, phead) { paclnode = list_entry(plist, struct rtw_wlan_acl_node, list);if (!memcmp (paclnode->addr, addr,ETH_ALEN )) { -if (paclnode->valid == true) { +if (paclnode->valid) { added = true;break ; } } } -spin_unlock_bh (&(pacl_node_q->lock)); +spin_unlock_bh (&pacl_node_q->lock);if (added)return ret; -spin_lock_bh (&(pacl_node_q->lock)); +spin_lock_bh (&pacl_node_q->lock);for (i =0 ; i <NUM_ACL ; i++) { paclnode = &pacl_list->aclnode[i];
@@ -1226,7 +1213,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr) } } -spin_unlock_bh (&(pacl_node_q->lock)); +spin_unlock_bh (&pacl_node_q->lock);return ret; }
@@ -1238,17 +1225,17 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)struct sta_priv *pstapriv = &padapter->stapriv;struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;struct __queue *pacl_node_q = &pacl_list->acl_node_q; -u8 baddr[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff };/* Baddr is used for clearing acl_list */ +u8 baddr[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff };/* Baddr is */ +/* used for clearing acl_list */ -spin_lock_bh (&(pacl_node_q->lock)); +spin_lock_bh (&pacl_node_q->lock); phead =get_list_head (pacl_node_q);list_for_each_safe (plist, tmp, phead) { paclnode = list_entry(plist, struct rtw_wlan_acl_node, list); -if ( - !memcmp (paclnode->addr, addr,ETH_ALEN ) || - !memcmp (baddr, addr,ETH_ALEN ) +if (!memcmp (paclnode->addr, addr,ETH_ALEN ) || + !memcmp (baddr, addr,ETH_ALEN ) ) {if (paclnode->valid) { paclnode->valid = false;
@@ -1260,8 +1247,7 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr) } } -spin_unlock_bh (&(pacl_node_q->lock)); - +spin_unlock_bh (&pacl_node_q->lock); }u8 rtw_ap_set_pairwise_key (struct adapter *padapter,struct sta_info *psta)
@@ -1284,13 +1270,13 @@ u8 rtw_ap_set_pairwise_key(struct adapter *padapter, struct sta_info *psta) goto exit; } -init_h2fwcmd_w_parm_no_rsp (ph2c, psetstakey_para, _SetStaKey_CMD_); +init_h2fwcmd_w_parm_no_rsp (ph2c, psetstakey_para, _set_stakey_cmd_); - psetstakey_para->algorithm = (u8 )psta->dot118021XPrivacy; + psetstakey_para->algorithm = (u8 )psta->dot118021_xprivacy;memcpy (psetstakey_para->addr, psta->hwaddr,ETH_ALEN ); -memcpy (psetstakey_para->key, &psta->dot118021x_UncstKey,16 ); +memcpy (psetstakey_para->key, &psta->dot118021x_uncst_key,16 ); res =rtw_enqueue_cmd (pcmdpriv, ph2c);
@@ -1299,18 +1285,17 @@ u8 rtw_ap_set_pairwise_key(struct adapter *padapter, struct sta_info *psta)return res; } -static int rtw_ap_set_key ( -struct adapter *padapter, -u8 *key, -u8 alg, -int keyid, -u8 set_tx +static int rtw_ap_set_key (struct adapter *padapter, +u8 *key, +u8 alg, +int keyid, +u8 set_tx ) {u8 keylen;struct cmd_obj *pcmd;struct setkey_parm *psetkeyparm; -struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); +struct cmd_priv *pcmdpriv = &padapter->cmdpriv;int res = _SUCCESS; pcmd =rtw_zmalloc (sizeof (struct cmd_obj ));
@@ -1347,9 +1332,9 @@ static int rtw_ap_set_key( keylen =16 ; } -memcpy (&(psetkeyparm->key[0 ]), key, keylen); +memcpy (&psetkeyparm->key[0 ], key, keylen); - pcmd->cmdcode = _SetKey_CMD_; + pcmd->cmdcode = _setkey_cmd_; pcmd->parmbuf = (u8 *)psetkeyparm; pcmd->cmdsz = (sizeof (struct setkey_parm )); pcmd->rsp =NULL ;
@@ -1369,12 +1354,11 @@ int rtw_ap_set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid)return rtw_ap_set_key (padapter, key, alg, keyid,1 ); } -int rtw_ap_set_wep_key ( -struct adapter *padapter, -u8 *key, -u8 keylen, -int keyid, -u8 set_tx +int rtw_ap_set_wep_key (struct adapter *padapter, +u8 *key, +u8 keylen, +int keyid, +u8 set_tx ) {u8 alg;
@@ -1399,10 +1383,10 @@ static void update_bcn_fixed_ie(struct adapter *padapter)static void update_bcn_erpinfo_ie (struct adapter *padapter) { -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;unsigned char *p, *ie = pnetwork->ies;u32 len =0 ;
@@ -1410,28 +1394,27 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter)return ;/* parsing ERP_IE */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_ERP_INFO , - &len, - (pnetwork->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_ERP_INFO , + &len, + (pnetwork->ie_length - _BEACON_IE_OFFSET_) );if (p && len >0 ) { -struct ndis_80211_var_ie *pIE = (struct ndis_80211_var_ie *)p; +struct ndis_80211_var_ie *p_ie = (struct ndis_80211_var_ie *)p;if (pmlmepriv->num_sta_non_erp ==1 ) - pIE->data[0 ] |=RTW_ERP_INFO_NON_ERP_PRESENT |RTW_ERP_INFO_USE_PROTECTION ; + p_ie->data[0 ] |=RTW_ERP_INFO_NON_ERP_PRESENT |RTW_ERP_INFO_USE_PROTECTION ;else - pIE->data[0 ] &= ~( -RTW_ERP_INFO_NON_ERP_PRESENT |RTW_ERP_INFO_USE_PROTECTION + p_ie->data[0 ] &= + ~(RTW_ERP_INFO_NON_ERP_PRESENT |RTW_ERP_INFO_USE_PROTECTION );if (pmlmepriv->num_sta_no_short_preamble >0 ) - pIE->data[0 ] |=RTW_ERP_INFO_BARKER_PREAMBLE_MODE ; + p_ie->data[0 ] |=RTW_ERP_INFO_BARKER_PREAMBLE_MODE ;else - pIE->data[0 ] &= ~(RTW_ERP_INFO_BARKER_PREAMBLE_MODE ); + p_ie->data[0 ] &= ~(RTW_ERP_INFO_BARKER_PREAMBLE_MODE ); -ERP_IE_handler (padapter, pIE); +ERP_IE_handler (padapter, p_ie); } }
@@ -1463,18 +1446,17 @@ static void update_bcn_wps_ie(struct adapter *padapter)u8 *pbackup_remainder_ie =NULL ;uint wps_ielen =0 , wps_offset, remainder_ielen; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;unsigned char *ie = pnetwork->ies;u32 ielen = pnetwork->ie_length; - pwps_ie =rtw_get_wps_ie ( - ie + _FIXED_IE_LENGTH_, - ielen - _FIXED_IE_LENGTH_, -NULL , - &wps_ielen + pwps_ie =rtw_get_wps_ie (ie + _FIXED_IE_LENGTH_, + ielen - _FIXED_IE_LENGTH_, +NULL , + &wps_ielen );if (!pwps_ie || wps_ielen ==0 )
@@ -1499,7 +1481,7 @@ static void update_bcn_wps_ie(struct adapter *padapter) wps_ielen = (uint )pwps_ie_src[1 ];/* to get ie data len */ if ((wps_offset + wps_ielen +2 + remainder_ielen) <=MAX_IE_SZ ) {memcpy (pwps_ie, pwps_ie_src, wps_ielen +2 ); - pwps_ie += (wps_ielen+2 ); + pwps_ie += (wps_ielen +2 );if (pbackup_remainder_ie)memcpy (pwps_ie, pbackup_remainder_ie, remainder_ielen);
@@ -1539,8 +1521,8 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)if (!padapter)return ; - pmlmepriv = &(padapter->mlmepriv); - pmlmeext = &(padapter->mlmeextpriv); + pmlmepriv = &padapter->mlmepriv; + pmlmeext = &padapter->mlmeextpriv;/* pmlmeinfo = &(pmlmeext->mlmext_info); */ if (!pmlmeext->bstart_bss)
@@ -1621,14 +1603,14 @@ static int rtw_ht_operation_update(struct adapter *padapter) {u16 cur_op_mode, new_op_mode;int op_mode_changes =0 ; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv;if (pmlmepriv->htpriv.ht_option)return 0 ; -if (!(pmlmepriv->ht_op_mode &IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT ) - && pmlmepriv->num_sta_ht_no_gf) { +if (!(pmlmepriv->ht_op_mode &IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT ) && + pmlmepriv->num_sta_ht_no_gf) { pmlmepriv->ht_op_mode |=IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT ; op_mode_changes++;
@@ -1660,9 +1642,8 @@ static int rtw_ht_operation_update(struct adapter *padapter)if (pmlmepriv->num_sta_no_ht || (pmlmepriv->ht_op_mode &IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT )) new_op_mode =IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED ; -else if ( - (le16_to_cpu (phtpriv_ap->ht_cap.cap_info) &IEEE80211_HT_CAP_SUP_WIDTH ) - && pmlmepriv->num_sta_ht_20mhz) +else if ((le16_to_cpu (phtpriv_ap->ht_cap.cap_info) & +IEEE80211_HT_CAP_SUP_WIDTH ) && pmlmepriv->num_sta_ht_20mhz) new_op_mode =IEEE80211_HT_OP_MODE_PROTECTION_20MHZ ;else if (pmlmepriv->olbc_ht) new_op_mode =IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER ;
@@ -1705,8 +1686,8 @@ void associated_clients_update(struct adapter *padapter, u8 updated)void bss_cap_update_on_sta_join (struct adapter *padapter,struct sta_info *psta) {u8 beacon_updated = false; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;if (!(psta->flags &WLAN_STA_SHORT_PREAMBLE )) {if (!psta->no_short_preamble_set) {
@@ -1825,8 +1806,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)u8 bss_cap_update_on_sta_leave (struct adapter *padapter,struct sta_info *psta) {u8 beacon_updated = false; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;if (!psta)return beacon_updated;
@@ -1834,8 +1815,8 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)if (psta->no_short_preamble_set) { psta->no_short_preamble_set =0 ; pmlmepriv->num_sta_no_short_preamble--; -if (pmlmeext->cur_wireless_mode >WIRELESS_11B - && pmlmepriv->num_sta_no_short_preamble ==0 ){ +if (pmlmeext->cur_wireless_mode >WIRELESS_11B && + pmlmepriv->num_sta_no_short_preamble ==0 ){ beacon_updated = true;update_beacon (padapter,0xFF ,NULL , true); }
@@ -1853,8 +1834,8 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)if (psta->no_short_slot_time_set) { psta->no_short_slot_time_set =0 ; pmlmepriv->num_sta_no_short_slot_time--; -if (pmlmeext->cur_wireless_mode >WIRELESS_11B - && pmlmepriv->num_sta_no_short_slot_time ==0 ){ +if (pmlmeext->cur_wireless_mode >WIRELESS_11B && + pmlmepriv->num_sta_no_short_slot_time ==0 ){ beacon_updated = true;update_beacon (padapter,0xFF ,NULL , true); }
@@ -1883,11 +1864,10 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)return beacon_updated; } -u8 ap_free_sta ( -struct adapter *padapter, -struct sta_info *psta, -bool active, -u16 reason +u8 ap_free_sta (struct adapter *padapter, +struct sta_info *psta, +bool active, +u16 reason ) {u8 beacon_updated = false;
@@ -1934,7 +1914,7 @@ void rtw_sta_flush(struct adapter *padapter)struct sta_info *psta =NULL ;struct sta_priv *pstapriv = &padapter->stapriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 bc_addr[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff };if ((pmlmeinfo->state &0x03 ) !=WIFI_FW_AP_STATE )
@@ -1964,7 +1944,7 @@ void rtw_sta_flush(struct adapter *padapter)void sta_info_update (struct adapter *padapter,struct sta_info *psta) {int flags = psta->flags; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;/* update wmm cap. */ if (WLAN_STA_WME & flags)
@@ -1993,47 +1973,46 @@ void sta_info_update(struct adapter *padapter, struct sta_info *psta)void ap_sta_info_defer_update (struct adapter *padapter,struct sta_info *psta) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (psta->state & _FW_LINKED) { pmlmeinfo->FW_sta_info[psta->mac_id].psta = psta;/* add ratid */ -add_RATid (padapter, psta,0 );/* DM_RATR_STA_INIT */ +add_rat_id (padapter, psta,0 );/* DM_RATR_STA_INIT */ } } +/* restore hw setting from sw data structures */ void rtw_ap_restore_network (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct sta_priv *pstapriv = &padapter->stapriv;struct sta_info *psta; -struct security_priv *psecuritypriv = &(padapter->securitypriv); +struct security_priv *psecuritypriv = &padapter->securitypriv;struct list_head *phead, *plist;u8 chk_alive_num =0 ;char chk_alive_list[NUM_STA ];int i; -rtw_setopmode_cmd (padapter, Ndis802_11APMode, false); +rtw_setopmode_cmd (padapter, ndis802_11apmode, false); -set_channel_bwmode ( - padapter, - pmlmeext->cur_channel, - pmlmeext->cur_ch_offset, - pmlmeext->cur_bwmode +set_channel_bwmode (padapter, + pmlmeext->cur_channel, + pmlmeext->cur_ch_offset, + pmlmeext->cur_bwmode );start_bss_network (padapter); -if ((padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_) || - (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) { +if ((padapter->securitypriv.dot11_privacy_algrthm == _TKIP_) || + (padapter->securitypriv.dot11_privacy_algrthm == _AES_)) {/* restore group key, WEP keys is restored in ips_leave() */ -rtw_set_key ( - padapter, - psecuritypriv, - psecuritypriv->dot118021XGrpKeyid, -0 , - false +rtw_set_key (padapter, + psecuritypriv, + psecuritypriv->dot118021_xgrp_keyid, +0 , + false ); }
@@ -2060,11 +2039,11 @@ void rtw_ap_restore_network(struct adapter *padapter)if (psta->state & _FW_LINKED) {rtw_sta_media_status_rpt (padapter, psta,1 ); -Update_RA_Entry (padapter, psta); +update_ra_entry (padapter, psta);/* pairwise key */ /* per sta pairwise key and settings */ -if ((psecuritypriv->dot11PrivacyAlgrthm == _TKIP_) || - (psecuritypriv->dot11PrivacyAlgrthm == _AES_)) { +if ((psecuritypriv->dot11_privacy_algrthm == _TKIP_) || + (psecuritypriv->dot11_privacy_algrthm == _AES_)) {rtw_setstakey_cmd (padapter, psta, true, false); } }
@@ -2074,7 +2053,7 @@ void rtw_ap_restore_network(struct adapter *padapter)void start_ap_mode (struct adapter *padapter) {int i; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct sta_priv *pstapriv = &padapter->stapriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
@@ -2111,7 +2090,7 @@ void start_ap_mode(struct adapter *padapter) pmlmepriv->p2p_probe_resp_ie =NULL ;/* for ACL */ -INIT_LIST_HEAD (&(pacl_list->acl_node_q.queue)); +INIT_LIST_HEAD (&pacl_list->acl_node_q.queue); pacl_list->num =0 ; pacl_list->mode =0 ;for (i =0 ; i <NUM_ACL ; i++) {
@@ -2126,7 +2105,7 @@ void stop_ap_mode(struct adapter *padapter)struct rtw_wlan_acl_node *paclnode;struct sta_info *psta =NULL ;struct sta_priv *pstapriv = &padapter->stapriv; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;struct __queue *pacl_node_q = &pacl_list->acl_node_q;
@@ -2135,16 +2114,15 @@ void stop_ap_mode(struct adapter *padapter) pmlmeext->bstart_bss = false;/* reset and init security priv , this can refine with rtw_reset_securitypriv */ -memset ( - (unsigned char *)&padapter->securitypriv, -0 , -sizeof (struct security_priv ) +memset ((unsigned char *)&padapter->securitypriv, +0 , +sizeof (struct security_priv ) ); - padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen; - padapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled; + padapter->securitypriv.ndisauthtype = ndis802_11auth_mode_open; + padapter->securitypriv.ndisencryptstatus = ndis802_11wep_disabled;/* for ACL */ -spin_lock_bh (&(pacl_node_q->lock)); +spin_lock_bh (&pacl_node_q->lock); phead =get_list_head (pacl_node_q);list_for_each_safe (plist, tmp, phead) { paclnode = list_entry(plist, struct rtw_wlan_acl_node, list);
@@ -2157,7 +2135,7 @@ void stop_ap_mode(struct adapter *padapter) pacl_list->num--; } } -spin_unlock_bh (&(pacl_node_q->lock)); +spin_unlock_bh (&pacl_node_q->lock);rtw_sta_flush (padapter);
@@ -2171,5 +2149,5 @@ void stop_ap_mode(struct adapter *padapter)rtw_free_mlme_priv_ie_data (pmlmepriv); -rtw_btcoex_MediaStatusNotify (padapter,0 );/* disconnect */ +rtw_btcoex_media_status_notify (padapter,0 );/* disconnect */ }
Signature · 1 line
2.25.1
Greg KH
maintainerQuoted 7 lines · Simone Serra
Fixes checkpatch warningds and checks
Signed-off-by Simone Serra <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_ap.c | 462 +++++++++++------------- 1 file changed, 220 insertions(+), 242 deletions(-)
Hi,
This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him a patch that has triggered this response. He used to manually respond to these common problems, but in order to save his sanity (he kept writing the same thing over and over, yet to different people), I was created. Hopefully you will not take offence and will fix the problem in your patch and resubmit it so that it can be accepted into the Linux kernel tree.
You are receiving this message because of the following common error(s) as indicated below:
- Your patch did many different things all at once, making it difficult to review. All Linux kernel patches need to only do one thing at a time. If you need to do multiple things (such as clean up all coding style issues in a file/driver), do it in a sequence of patches, each one doing only one thing. This will make it easier to review the patches to ensure that they are correct, and to help alleviate any merge issues that larger patches can cause.
- You did not specify a description of why the patch is needed, or possibly, any description at all, in the email body. Please read the section entitled "The canonical patch format" in the kernel file, Documentation/SubmittingPatches for what is needed in order to properly describe the change.
- You did not write a descriptive Subject: for the patch, allowing Greg, and everyone else, to know what this patch is all about. Please read the section entitled "The canonical patch format" in the kernel file, Documentation/SubmittingPatches for what a proper Subject: line should look like.
If you wish to discuss this problem further, or you have questions about how to resolve this issue, please feel free to respond to this email and Greg will reply once he has dug out from the pending patches received from other developers.
thanks,
greg k-h's patch email bot
kernel test robot
build botThank you for the patch! Yet something to improve:
Hi Simone,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on staging/staging-testing]
[also build test ERROR on linus/master v5.19 next-20220805] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Simone-Serra/Fixes-checkpatch-warnings-and-checks/20220805-154109 base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git b2a88c212e652e94f1e4b635910972ac57ba4e97 config: i386-allyesconfig (https://download.01.org/0day-ci/archive/20220807/[email protected]/config) compiler: gcc-11 (Debian 11.3.0-3) 11.3.0 reproduce (this is a W=1 build): # https://github.com/intel-lab-lkp/linux/commit/d73d8cf7a17857c53ecdf684477d60e3492f0978 git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review Simone-Serra/Fixes-checkpatch-warnings-and-checks/20220805-154109 git checkout d73d8cf7a17857c53ecdf684477d60e3492f0978 # save the config file mkdir build_dir && cp config build_dir/.config make W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/staging/rtl8723bs/
If you fix the issue, kindly add following tag where applicable
Reported-by kernel test robot <[email protected]>
All error/warnings (new ones prefixed by >>):
drivers/staging/rtl8723bs/core/rtw_ap.c: In function 'expire_timeout_chk':
>> drivers/staging/rtl8723bs/core/rtw_ap.c:280:25: error: implicit declaration of function 'select_channel'; did you mean 'SelectChannel'? [-Werror=implicit-function-declaration]
280 | select_channel(padapter, pmlmeext->cur_channel);
| ^~~~~~~~~~~~~~
| SelectChannel
drivers/staging/rtl8723bs/core/rtw_ap.c: At top level:
>> drivers/staging/rtl8723bs/core/rtw_ap.c:324:6: warning: no previous prototype for 'add_ratid' [-Wmissing-prototypes]
324 | void add_ratid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
| ^~~~~~~~~
drivers/staging/rtl8723bs/core/rtw_ap.c: In function 'update_sta_info_apmode':
>> drivers/staging/rtl8723bs/core/rtw_ap.c:468:28: error: 'struct security_priv' has no member named 'dot11_auth_algrthm'; did you mean 'dot11AuthAlgrthm'?
468 | if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021X)
| ^~~~~~~~~~~~~~~~~~
| dot11AuthAlgrthm
>> drivers/staging/rtl8723bs/core/rtw_ap.c:468:50: error: 'dot11_auth_algrthm_8021X' undeclared (first use in this function); did you mean 'dot11AuthAlgrthm_8021X'?
468 | if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021X)
| ^~~~~~~~~~~~~~~~~~~~~~~~
| dot11AuthAlgrthm_8021X
drivers/staging/rtl8723bs/core/rtw_ap.c:468:50: note: each undeclared identifier is reported only once for each function it appears in
drivers/staging/rtl8723bs/core/rtw_ap.c: In function 'start_bss_network':
>> drivers/staging/rtl8723bs/core/rtw_ap.c:683:37: error: 'struct security_priv' has no member named 'dot11_privacy_algrthm'; did you mean 'dot11PrivacyAlgrthm'?
683 | if ((psecuritypriv->dot11_privacy_algrthm != _WEP40_) &&
| ^~~~~~~~~~~~~~~~~~~~~
| dot11PrivacyAlgrthm
drivers/staging/rtl8723bs/core/rtw_ap.c:684:37: error: 'struct security_priv' has no member named 'dot11_privacy_algrthm'; did you mean 'dot11PrivacyAlgrthm'?
684 | (psecuritypriv->dot11_privacy_algrthm != _WEP104_))
| ^~~~~~~~~~~~~~~~~~~~~
| dot11PrivacyAlgrthm
>> drivers/staging/rtl8723bs/core/rtw_ap.c:689:9: error: implicit declaration of function 'set_msr'; did you mean 'Set_MSR'? [-Werror=implicit-function-declaration]
689 | set_msr(padapter, _HW_STATE_AP_);
| ^~~~~~~
| Set_MSR
drivers/staging/rtl8723bs/core/rtw_ap.c:706:32: error: 'struct security_priv' has no member named 'dot11_auth_algrthm'; did you mean 'dot11AuthAlgrthm'?
706 | val8 = (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021X
| ^~~~~~~~~~~~~~~~~~
| dot11AuthAlgrthm
drivers/staging/rtl8723bs/core/rtw_ap.c:706:54: error: 'dot11_auth_algrthm_8021X' undeclared (first use in this function); did you mean 'dot11AuthAlgrthm_8021X'?
706 | val8 = (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021X
| ^~~~~~~~~~~~~~~~~~~~~~~~
| dot11AuthAlgrthm_8021X
>> drivers/staging/rtl8723bs/core/rtw_ap.c:725:17: error: implicit declaration of function 'switch_DM_func'; did you mean 'Switch_DM_Func'? [-Werror=implicit-function-declaration]
725 | switch_DM_func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true);
| ^~~~~~~~~~~~~~
| Switch_DM_Func
>> drivers/staging/rtl8723bs/core/rtw_ap.c:783:9: error: implicit declaration of function 'update_brate_tbl'; did you mean 'UpdateBrateTbl'? [-Werror=implicit-function-declaration]
783 | update_brate_tbl(padapter, pnetwork->supported_rates);
| ^~~~~~~~~~~~~~~~
| UpdateBrateTbl
drivers/staging/rtl8723bs/core/rtw_ap.c: In function 'rtw_check_beacon_data':
>> drivers/staging/rtl8723bs/core/rtw_ap.c:837:50: error: 'ndis802_11_ap_mode' undeclared (first use in this function); did you mean 'Ndis802_11APMode'?
837 | if (pbss_network->infrastructure_mode != ndis802_11_ap_mode)
| ^~~~~~~~~~~~~~~~~~
| Ndis802_11APMode
drivers/staging/rtl8723bs/core/rtw_ap.c:940:40: error: 'struct security_priv' has no member named 'dot11_auth_algrthm'; did you mean 'dot11AuthAlgrthm'?
940 | psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021X;
| ^~~~~~~~~~~~~~~~~~
| dot11AuthAlgrthm
drivers/staging/rtl8723bs/core/rtw_ap.c:940:61: error: 'dot11_auth_algrthm_8021X' undeclared (first use in this function); did you mean 'dot11AuthAlgrthm_8021X'?
940 | psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021X;
| ^~~~~~~~~~~~~~~~~~~~~~~~
| dot11AuthAlgrthm_8021X
drivers/staging/rtl8723bs/core/rtw_ap.c:969:48: error: 'struct security_priv' has no member named 'dot11_auth_algrthm'; did you mean 'dot11AuthAlgrthm'?
969 | psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021X;
| ^~~~~~~~~~~~~~~~~~
| dot11AuthAlgrthm
>> drivers/staging/rtl8723bs/core/rtw_ap.c:1089:53: error: 'ndis802_11ds' undeclared (first use in this function); did you mean 'Ndis802_11DS'?
1089 | pbss_network->network_type_in_use = ndis802_11ds;
| ^~~~~~~~~~~~
| Ndis802_11DS
>> drivers/staging/rtl8723bs/core/rtw_ap.c:1095:53: error: 'ndis802_11ofdm24' undeclared (first use in this function); did you mean 'Ndis802_11OFDM24'?
1095 | pbss_network->network_type_in_use = ndis802_11ofdm24;
| ^~~~~~~~~~~~~~~~
| Ndis802_11OFDM24
>> drivers/staging/rtl8723bs/core/rtw_ap.c:1120:17: error: implicit declaration of function 'ht_caps_handler'; did you mean 'HT_caps_handler'? [-Werror=implicit-function-declaration]
1120 | ht_caps_handler(padapter, (struct ndis_80211_var_ie *)pht_caps_ie);
| ^~~~~~~~~~~~~~~
| HT_caps_handler
>> drivers/staging/rtl8723bs/core/rtw_ap.c:1122:17: error: implicit declaration of function 'ht_info_handler'; did you mean 'HT_info_handler'? [-Werror=implicit-function-declaration]
1122 | ht_info_handler(padapter, (struct ndis_80211_var_ie *)pht_info_ie);
| ^~~~~~~~~~~~~~~
| HT_info_handler
In file included from drivers/staging/rtl8723bs/include/drv_types.h:29,
from drivers/staging/rtl8723bs/core/rtw_ap.c:8:
drivers/staging/rtl8723bs/core/rtw_ap.c: In function 'rtw_ap_set_pairwise_key':
>> drivers/staging/rtl8723bs/core/rtw_ap.c:1273:59: error: '_set_stakey_cmd_' undeclared (first use in this function); did you mean 'set_stakey_hdl'?
1273 | init_h2fwcmd_w_parm_no_rsp(ph2c, psetstakey_para, _set_stakey_cmd_);
| ^~~~~~~~~~~~~~~~
drivers/staging/rtl8723bs/include/rtw_cmd.h:76:25: note: in definition of macro 'init_h2fwcmd_w_parm_no_rsp'
76 | pcmd->cmdcode = code;\
| ^~~~
>> drivers/staging/rtl8723bs/core/rtw_ap.c:1275:48: error: 'struct sta_info' has no member named 'dot118021_xprivacy'; did you mean 'dot118021XPrivacy'?
1275 | psetstakey_para->algorithm = (u8)psta->dot118021_xprivacy;
| ^~~~~~~~~~~~~~~~~~
| dot118021XPrivacy
In file included from include/linux/string.h:253,
from arch/x86/include/asm/page_32.h:22,
from arch/x86/include/asm/page.h:14,
from arch/x86/include/asm/thread_info.h:12,
from include/linux/thread_info.h:60,
from arch/x86/include/asm/preempt.h:7,
from include/linux/preempt.h:78,
from include/linux/rcupdate.h:27,
from include/linux/rculist.h:11,
from include/linux/sched/signal.h:5,
from drivers/staging/rtl8723bs/include/drv_types.h:17,
from drivers/staging/rtl8723bs/core/rtw_ap.c:8:
>> drivers/staging/rtl8723bs/core/rtw_ap.c:1279:45: error: 'struct sta_info' has no member named 'dot118021x_uncst_key'; did you mean 'dot118021x_UncstKey'?
1279 | memcpy(psetstakey_para->key, &psta->dot118021x_uncst_key, 16);
| ^~~~~~~~~~~~~~~~~~~~
include/linux/fortify-string.h:376:52: note: in definition of macro '__fortify_memcpy_chk'
376 | fortify_memcpy_chk(__fortify_size, p_size, q_size, \
| ^~~~~~
drivers/staging/rtl8723bs/core/rtw_ap.c:1279:9: note: in expansion of macro 'memcpy'
1279 | memcpy(psetstakey_para->key, &psta->dot118021x_uncst_key, 16);
| ^~~~~~
>> drivers/staging/rtl8723bs/core/rtw_ap.c:1279:45: error: 'struct sta_info' has no member named 'dot118021x_uncst_key'; did you mean 'dot118021x_UncstKey'?
1279 | memcpy(psetstakey_para->key, &psta->dot118021x_uncst_key, 16);
| ^~~~~~~~~~~~~~~~~~~~
include/linux/fortify-string.h:377:42: note: in definition of macro '__fortify_memcpy_chk'
377 | p_size_field, q_size_field, #op); \
| ^~~~~~~~~~~~
drivers/staging/rtl8723bs/core/rtw_ap.c:1279:9: note: in expansion of macro 'memcpy'
1279 | memcpy(psetstakey_para->key, &psta->dot118021x_uncst_key, 16);
| ^~~~~~
>> drivers/staging/rtl8723bs/core/rtw_ap.c:1279:45: error: 'struct sta_info' has no member named 'dot118021x_uncst_key'; did you mean 'dot118021x_UncstKey'?
1279 | memcpy(psetstakey_para->key, &psta->dot118021x_uncst_key, 16);
| ^~~~~~~~~~~~~~~~~~~~
include/linux/fortify-string.h:378:30: note: in definition of macro '__fortify_memcpy_chk'
378 | __underlying_##op(p, q, __fortify_size); \
| ^
drivers/staging/rtl8723bs/core/rtw_ap.c:1279:9: note: in expansion of macro 'memcpy'
1279 | memcpy(psetstakey_para->key, &psta->dot118021x_uncst_key, 16);
| ^~~~~~
drivers/staging/rtl8723bs/core/rtw_ap.c: In function 'rtw_ap_set_key':
>> drivers/staging/rtl8723bs/core/rtw_ap.c:1337:25: error: '_setkey_cmd_' undeclared (first use in this function); did you mean '_SetKey_CMD_'?
1337 | pcmd->cmdcode = _setkey_cmd_;
| ^~~~~~~~~~~~
| _SetKey_CMD_
drivers/staging/rtl8723bs/core/rtw_ap.c: In function 'ap_sta_info_defer_update':
>> drivers/staging/rtl8723bs/core/rtw_ap.c:1982:17: error: implicit declaration of function 'add_rat_id'; did you mean 'add_ratid'? [-Werror=implicit-function-declaration]
1982 | add_rat_id(padapter, psta, 0);/* DM_RATR_STA_INIT */
| ^~~~~~~~~~
| add_ratid
drivers/staging/rtl8723bs/core/rtw_ap.c: In function 'rtw_ap_restore_network':
drivers/staging/rtl8723bs/core/rtw_ap.c:1998:37: error: 'ndis802_11apmode' undeclared (first use in this function); did you mean 'Ndis802_11APMode'?
1998 | rtw_setopmode_cmd(padapter, ndis802_11apmode, false);
| ^~~~~~~~~~~~~~~~
| Ndis802_11APMode
drivers/staging/rtl8723bs/core/rtw_ap.c:2008:37: error: 'struct security_priv' has no member named 'dot11_privacy_algrthm'; did you mean 'dot11PrivacyAlgrthm'?
2008 | if ((padapter->securitypriv.dot11_privacy_algrthm == _TKIP_) ||
| ^~~~~~~~~~~~~~~~~~~~~
| dot11PrivacyAlgrthm
drivers/staging/rtl8723bs/core/rtw_ap.c:2009:37: error: 'struct security_priv' has no member named 'dot11_privacy_algrthm'; did you mean 'dot11PrivacyAlgrthm'?
2009 | (padapter->securitypriv.dot11_privacy_algrthm == _AES_)) {
| ^~~~~~~~~~~~~~~~~~~~~
| dot11PrivacyAlgrthm
drivers/staging/rtl8723bs/core/rtw_ap.c:2013:44: error: 'struct security_priv' has no member named 'dot118021_xgrp_keyid'; did you mean 'dot118021XGrpKeyid'?
2013 | psecuritypriv->dot118021_xgrp_keyid,
| ^~~~~~~~~~~~~~~~~~~~
| dot118021XGrpKeyid
drivers/staging/rtl8723bs/core/rtw_ap.c:2042:25: error: implicit declaration of function 'update_ra_entry'; did you mean 'Update_RA_Entry'? [-Werror=implicit-function-declaration]
2042 | update_ra_entry(padapter, psta);
| ^~~~~~~~~~~~~~~
| Update_RA_Entry
drivers/staging/rtl8723bs/core/rtw_ap.c:2045:45: error: 'struct security_priv' has no member named 'dot11_privacy_algrthm'; did you mean 'dot11PrivacyAlgrthm'?
2045 | if ((psecuritypriv->dot11_privacy_algrthm == _TKIP_) ||
| ^~~~~~~~~~~~~~~~~~~~~
| dot11PrivacyAlgrthm
drivers/staging/rtl8723bs/core/rtw_ap.c:2046:45: error: 'struct security_priv' has no member named 'dot11_privacy_algrthm'; did you mean 'dot11PrivacyAlgrthm'?
2046 | (psecuritypriv->dot11_privacy_algrthm == _AES_)) {
| ^~~~~~~~~~~~~~~~~~~~~
| dot11PrivacyAlgrthm
drivers/staging/rtl8723bs/core/rtw_ap.c: In function 'stop_ap_mode':
drivers/staging/rtl8723bs/core/rtw_ap.c:2121:47: error: 'ndis802_11auth_mode_open' undeclared (first use in this function); did you mean 'Ndis802_11AuthModeOpen'?
2121 | padapter->securitypriv.ndisauthtype = ndis802_11auth_mode_open;
| ^~~~~~~~~~~~~~~~~~~~~~~~
| Ndis802_11AuthModeOpen
drivers/staging/rtl8723bs/core/rtw_ap.c:2122:52: error: 'ndis802_11wep_disabled' undeclared (first use in this function); did you mean 'Ndis802_11WEPDisabled'?
2122 | padapter->securitypriv.ndisencryptstatus = ndis802_11wep_disabled;
| ^~~~~~~~~~~~~~~~~~~~~~
| Ndis802_11WEPDisabled
drivers/staging/rtl8723bs/core/rtw_ap.c:2152:9: error: implicit declaration of function 'rtw_btcoex_media_status_notify'; did you mean 'rtw_btcoex_MediaStatusNotify'? [-Werror=implicit-function-declaration]
2152 | rtw_btcoex_media_status_notify(padapter, 0); /* disconnect */
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| rtw_btcoex_MediaStatusNotifycc1: some warnings being treated as errors
vim +280 drivers/staging/rtl8723bs/core/rtw_ap.c
173
174 void expire_timeout_chk(struct adapter *padapter)
175 {
176 struct list_head *phead, *plist, *tmp;
177 u8 updated = false;
178 struct sta_info *psta = NULL;
179 struct sta_priv *pstapriv = &padapter->stapriv;
180 u8 chk_alive_num = 0;
181 char chk_alive_list[NUM_STA];
182 int i;
183
184 spin_lock_bh(&pstapriv->auth_list_lock);
185
186 phead = &pstapriv->auth_list;
187 /* check auth_queue */
188 list_for_each_safe(plist, tmp, phead) {
189 psta = list_entry(plist, struct sta_info, auth_list);
190
191 if (psta->expire_to > 0) {
192 psta->expire_to--;
193 if (psta->expire_to == 0) {
194 list_del_init(&psta->auth_list);
195 pstapriv->auth_list_cnt--;
196
197 spin_unlock_bh(&pstapriv->auth_list_lock);
198
199 rtw_free_stainfo(padapter, psta);
200
201 spin_lock_bh(&pstapriv->auth_list_lock);
202 }
203 }
204 }
205
206 spin_unlock_bh(&pstapriv->auth_list_lock);
207 psta = NULL;
208
209 spin_lock_bh(&pstapriv->asoc_list_lock);
210
211 phead = &pstapriv->asoc_list;
212 /* check asoc_queue */
213 list_for_each_safe(plist, tmp, phead) {
214 psta = list_entry(plist, struct sta_info, asoc_list);
215 if (chk_sta_is_alive(psta) || !psta->expire_to) {
216 psta->expire_to = pstapriv->expire_to;
217 psta->keep_alive_trycnt = 0;
218 psta->under_exist_checking = 0;
219 } else {
220 if (psta->expire_to > 0)
221 psta->expire_to--;
222 }
223
224 if (psta->expire_to == 0) {
225 struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
226
227 if (padapter->registrypriv.wifi_spec == 1) {
228 psta->expire_to = pstapriv->expire_to;
229 continue;
230 }
231
232 if (psta->state & WIFI_SLEEP_STATE) {
233 if (!(psta->state & WIFI_STA_ALIVE_CHK_STATE)) {
234 /* to check if alive by another methods */
235 /* if station is at ps mode. */
236 psta->expire_to = pstapriv->expire_to;
237 psta->state |= WIFI_STA_ALIVE_CHK_STATE;
238
239 /* to update bcn with tim_bitmap for this station */
240 pstapriv->tim_bitmap |= BIT(psta->aid);
241 update_beacon(padapter, WLAN_EID_TIM, NULL, true);
242
243 if (!pmlmeext->active_keep_alive_check)
244 continue;
245 }
246 }
247 if (pmlmeext->active_keep_alive_check) {
248 int stainfo_offset;
249
250 stainfo_offset = rtw_stainfo_offset(pstapriv, psta);
251 if (stainfo_offset_valid(stainfo_offset))
252 chk_alive_list[chk_alive_num++] = stainfo_offset;
253
254 continue;
255 }
256 list_del_init(&psta->asoc_list);
257 pstapriv->asoc_list_cnt--;
258 updated = ap_free_sta(padapter, psta, false, WLAN_REASON_DEAUTH_LEAVING);
259 } else {
260 /* TODO: Aging mechanism to digest frames in sleep_q to */
261 /* avoid running out of xmitframe */
262 if (psta->sleepq_len > (NR_XMITFRAME / pstapriv->asoc_list_cnt) &&
263 padapter->xmitpriv.free_xmitframe_cnt <
264 ((NR_XMITFRAME / pstapriv->asoc_list_cnt
265 ) / 2)
266 )
267 wakeup_sta_to_xmit(padapter, psta);
268 }
269 }
270
271 spin_unlock_bh(&pstapriv->asoc_list_lock);
272
273 if (chk_alive_num) {
274 u8 backup_oper_channel = 0;
275 struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
276
277 /* switch to correct channel of current network before issue keep-alive frames */
278 if (rtw_get_oper_ch(padapter) != pmlmeext->cur_channel) {
279 backup_oper_channel = rtw_get_oper_ch(padapter);
> 280 select_channel(padapter, pmlmeext->cur_channel);
281 }
282
283 /* issue null data to check sta alive*/
284 for (i = 0; i < chk_alive_num; i++) {
285 int ret = _FAIL;
286
287 psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]);
288 if (!(psta->state & _FW_LINKED))
289 continue;
290
291 if (psta->state & WIFI_SLEEP_STATE)
292 ret = issue_nulldata(padapter, psta->hwaddr, 0, 1, 50);
293 else
294 ret = issue_nulldata(padapter, psta->hwaddr, 0, 3, 50);
295
296 psta->keep_alive_trycnt++;
297 if (ret == _SUCCESS) {
298 psta->expire_to = pstapriv->expire_to;
299 psta->keep_alive_trycnt = 0;
300 continue;
301 } else if (psta->keep_alive_trycnt <= 3) {
302 psta->expire_to = 1;
303 continue;
304 }
305
306 psta->keep_alive_trycnt = 0;
307 spin_lock_bh(&pstapriv->asoc_list_lock);
308 if (list_empty(&psta->asoc_list) == false) {
309 list_del_init(&psta->asoc_list);
310 pstapriv->asoc_list_cnt--;
311 updated = ap_free_sta(padapter, psta, false,
312 WLAN_REASON_DEAUTH_LEAVING);
313 }
314 spin_unlock_bh(&pstapriv->asoc_list_lock);
315 }
316
317 if (backup_oper_channel > 0) /* back to the original operation channel */
318 select_channel(padapter, backup_oper_channel);
319 }
320
321 associated_clients_update(padapter, updated);
322 }
323
> 324 void add_ratid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
325 {
326 unsigned char sta_band = 0, short_gi_rate = false;
327 unsigned int tx_ra_bitmap = 0;
328 struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
329 struct wlan_bssid_ex
330 *pcur_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
331
332 if (!psta)
333 return;
334
335 if (!(psta->state & _FW_LINKED))
336 return;
337
338 rtw_hal_update_sta_rate_mask(padapter, psta);
339 tx_ra_bitmap = psta->ra_mask;
340
341 short_gi_rate = query_ra_short_GI(psta);
342
343 if (pcur_network->configuration.ds_config > 14) {
344 sta_band |= WIRELESS_INVALID;
345 } else {
346 if (tx_ra_bitmap & 0xffff000)
347 sta_band |= WIRELESS_11_24N;
348
349 if (tx_ra_bitmap & 0xff0)
350 sta_band |= WIRELESS_11G;
351
352 if (tx_ra_bitmap & 0x0f)
353 sta_band |= WIRELESS_11B;
354 }
355
356 psta->wireless_mode = sta_band;
357 psta->raid = networktype_to_raid_ex(padapter, psta);
358
359 if (psta->aid < NUM_STA) {
360 u8 arg[4] = {0};
361
362 arg[0] = psta->mac_id;
363 arg[1] = psta->raid;
364 arg[2] = short_gi_rate;
365 arg[3] = psta->init_rate;
366
367 rtw_hal_add_ra_tid(padapter, tx_ra_bitmap, arg, rssi_level);
368 }
369 }
370
371 void update_bmc_sta(struct adapter *padapter)
372 {
373 unsigned char network_type;
374 int support_rate_num = 0;
375 unsigned int tx_ra_bitmap = 0;
376 struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
377 struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
378 struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
379 struct wlan_bssid_ex
380 *pcur_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
381 struct sta_info *psta = rtw_get_bcmc_stainfo(padapter);
382
383 if (psta) {
384 psta->aid = 0;/* default set to 0 */
385 /* psta->mac_id = psta->aid+4; */
386 psta->mac_id = psta->aid + 1;/* mac_id = 1 for bc/mc stainfo */
387
388 pmlmeinfo->FW_sta_info[psta->mac_id].psta = psta;
389
390 psta->qos_option = 0;
391 psta->htpriv.ht_option = false;
392
393 psta->ieee8021x_blocked = 0;
394
395 memset((void *)&psta->sta_stats, 0, sizeof(struct stainfo_stats));
396
397 /* prepare for add_RATid */
398 support_rate_num = rtw_get_rateset_len((u8 *)&pcur_network->supported_rates);
399 network_type = rtw_check_network_type((u8 *)&pcur_network->supported_rates,
400 support_rate_num,
401 pcur_network->configuration.ds_config
402 );
403 if (is_supported_tx_cck(network_type)) {
404 network_type = WIRELESS_11B;
405 } else if (network_type == WIRELESS_INVALID) { /* error handling */
406
407 if (pcur_network->configuration.ds_config > 14)
408 network_type = WIRELESS_INVALID;
409 else
410 network_type = WIRELESS_11B;
411 }
412 update_sta_basic_rate(psta, network_type);
413 psta->wireless_mode = network_type;
414
415 rtw_hal_update_sta_rate_mask(padapter, psta);
416 tx_ra_bitmap = psta->ra_mask;
417
418 psta->raid = networktype_to_raid_ex(padapter, psta);
419
420 /* ap mode */
421 rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true);
422
423 /* if (pHalData->fw_ractrl == true) */
424 {
425 u8 arg[4] = {0};
426
427 arg[0] = psta->mac_id;
428 arg[1] = psta->raid;
429 arg[2] = 0;
430 arg[3] = psta->init_rate;
431
432 rtw_hal_add_ra_tid(padapter, tx_ra_bitmap, arg, 0);
433 }
434
435 rtw_sta_media_status_rpt(padapter, psta, 1);
436
437 spin_lock_bh(&psta->lock);
438 psta->state = _FW_LINKED;
439 spin_unlock_bh(&psta->lock);
440 }
441 }
442
443 /* notes: */
444 /* AID: 1~MAX for sta and 0 for bc/mc in ap/adhoc mode */
445 /* MAC_ID = AID+1 for sta in ap/adhoc mode */
446 /* MAC_ID = 1 for bc/mc for sta/ap/adhoc */
447 /* MAC_ID = 0 for bssid for sta/ap/adhoc */
448 /* CAM_ID = 0~3 for default key, cmd_id =macid + 3, macid =aid+1; */
449
450 void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)
451 {
452 struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
453 struct security_priv *psecuritypriv = &padapter->securitypriv;
454 struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
455 struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv;
456 struct ht_priv *phtpriv_sta = &psta->htpriv;
457 u8 cur_ldpc_cap = 0, cur_stbc_cap = 0, cur_beamform_cap = 0;
458 /* set intf_tag to if1 */
459 /* psta->intf_tag = 0; */
460
461 /* psta->mac_id = psta->aid+4; */
462 /* psta->mac_id = psta->aid+1;//alloc macid when call rtw_alloc_stainfo(), */
463 /* release macid when call rtw_free_stainfo() */
464
465 /* ap mode */
466 rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true);
467
> 468 if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021X) 469 psta->ieee8021x_blocked = true;
470 else
471 psta->ieee8021x_blocked = false;
472
473 /* update sta's cap */
474
475 /* ERP */
476 VCS_update(padapter, psta);
477
478 /* HT related cap */
479 if (phtpriv_sta->ht_option) {
480 /* check if sta supports rx ampdu */
481 phtpriv_sta->ampdu_enable = phtpriv_ap->ampdu_enable;
482
483 phtpriv_sta->rx_ampdu_min_spacing =
484 (phtpriv_sta->ht_cap.ampdu_params_info & IEEE80211_HT_CAP_AMPDU_DENSITY
485 ) >> 2;
486
487 /* bwmode */
488 if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info
489 ) & cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH))
490 psta->bw_mode = CHANNEL_WIDTH_40;
491 else
492 psta->bw_mode = CHANNEL_WIDTH_20;
493
494 if (pmlmeext->cur_bwmode < psta->bw_mode)
495 psta->bw_mode = pmlmeext->cur_bwmode;
496
497 phtpriv_sta->ch_offset = pmlmeext->cur_ch_offset;
498
499 /* check if sta support s Short GI 20M */
500 if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info
501 ) & cpu_to_le16(IEEE80211_HT_CAP_SGI_20))
502 phtpriv_sta->sgi_20m = true;
503
504 /* check if sta support s Short GI 40M */
505 if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info
506 ) & cpu_to_le16(IEEE80211_HT_CAP_SGI_40)) {
507 if (psta->bw_mode == CHANNEL_WIDTH_40) /* according to psta->bw_mode */
508 phtpriv_sta->sgi_40m = true;
509 else
510 phtpriv_sta->sgi_40m = false;
511 }
512
513 psta->qos_option = true;
514
515 /* B0 Config LDPC Coding Capability */
516 if (TEST_FLAG(phtpriv_ap->ldpc_cap, LDPC_HT_ENABLE_TX) &&
517 GET_HT_CAPABILITY_ELE_LDPC_CAP((u8 *)(&phtpriv_sta->ht_cap)))
518 SET_FLAG(cur_ldpc_cap, (LDPC_HT_ENABLE_TX | LDPC_HT_CAP_TX));
519
520 /* B7 B8 B9 Config STBC setting */
521 if (TEST_FLAG(phtpriv_ap->stbc_cap, STBC_HT_ENABLE_TX) &&
522 GET_HT_CAPABILITY_ELE_RX_STBC((u8 *)(&phtpriv_sta->ht_cap)))
523 SET_FLAG(cur_stbc_cap, (STBC_HT_ENABLE_TX | STBC_HT_CAP_TX));
524 } else {
525 phtpriv_sta->ampdu_enable = false;
526
527 phtpriv_sta->sgi_20m = false;
528 phtpriv_sta->sgi_40m = false;
529 psta->bw_mode = CHANNEL_WIDTH_20;
530 phtpriv_sta->ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
531 }
532
533 phtpriv_sta->ldpc_cap = cur_ldpc_cap;
534 phtpriv_sta->stbc_cap = cur_stbc_cap;
535 phtpriv_sta->beamform_cap = cur_beamform_cap;
536
537 /* Rx AMPDU */
538 send_delba(padapter, 0, psta->hwaddr);/* recipient */
539
540 /* TX AMPDU */
541 send_delba(padapter, 1, psta->hwaddr);/* originator */
542 phtpriv_sta->agg_enable_bitmap = 0x0;/* reset */
543 phtpriv_sta->candidate_tid_bitmap = 0x0;/* reset */
544
545 update_ldpc_stbc_cap(psta);
546
547 /* todo: init other variables */
548
549 memset((void *)&psta->sta_stats, 0, sizeof(struct stainfo_stats));
550
551 /* add ratid */
552 /* add_RATid(padapter, psta);//move to ap_sta_info_defer_update() */
553
554 spin_lock_bh(&psta->lock);
555 psta->state |= _FW_LINKED;
556 spin_unlock_bh(&psta->lock);
557 }
558
Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp