From c803b22c5349fa287a3bdbda841bf4c0c68852de Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 20 Jul 2013 21:59:59 -0500 Subject: [PATCH] rtl8188eu: Remove CONFIG_STA_MODE_SCAN_UNDER_AP_MODE - not defined Signed-off-by: Larry Finger --- core/rtw_cmd.c | 7 +------ core/rtw_mlme_ext.c | 44 +++--------------------------------------- include/rtw_mlme_ext.h | 7 ------- 3 files changed, 4 insertions(+), 54 deletions(-) diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 2679b18..01453a0 100644 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -700,12 +700,7 @@ _func_enter_; pmlmepriv->scan_start_time = rtw_get_current_time(); -#ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE - if ((padapter->pbuddy_adapter->mlmeextpriv.mlmext_info.state&0x03) == WIFI_FW_AP_STATE) - _set_timer(&pmlmepriv->scan_to_timer, SURVEY_TO * ( 38 + ( 38 / RTW_SCAN_NUM_OF_CH ) * RTW_STAY_AP_CH_MILLISECOND ) + 1000 ); - else -#endif /* CONFIG_STA_MODE_SCAN_UNDER_AP_MODE */ - _set_timer(&pmlmepriv->scan_to_timer, SCANNING_TIMEOUT); + _set_timer(&pmlmepriv->scan_to_timer, SCANNING_TIMEOUT); rtw_led_control(padapter, LED_CTL_SITE_SURVEY); diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index eebd6ae..a5f7ba5 100644 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -7353,25 +7353,6 @@ void site_survey(_adapter *padapter) SelectChannel(padapter, survey_channel); } -#ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE - if ( stay_buddy_ch == 1 ) - { - val8 = 0; /* survey done */ - rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); - - if (check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) && - check_buddy_fwstate(padapter, _FW_LINKED)) - { - update_beacon(padapter->pbuddy_adapter, 0, NULL, true); - } - } - else if ( stay_buddy_ch == 2 ) - { - val8 = 1; /* under site survey */ - rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); - } -#endif /* CONFIG_STA_MODE_SCAN_UNDER_AP_MODE */ - if (ScanType == SCAN_ACTIVE) /* obey the channel plan setting... */ { #ifdef CONFIG_P2P @@ -7405,17 +7386,8 @@ void site_survey(_adapter *padapter) } } -#ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE - if ( stay_buddy_ch == 1 ) - set_survey_timer(pmlmeext, pmlmeext->chan_scan_time * RTW_STAY_AP_CH_MILLISECOND ); - else -#endif /* CONFIG_STA_MODE_SCAN_UNDER_AP_MODE */ - set_survey_timer(pmlmeext, pmlmeext->chan_scan_time); - - } - else - { - + set_survey_timer(pmlmeext, pmlmeext->chan_scan_time); + } else { /* channel number is 0 or this channel is not valid. */ #ifdef CONFIG_P2P @@ -7450,11 +7422,6 @@ void site_survey(_adapter *padapter) else #endif /* CONFIG_P2P */ { - -#ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE - pmlmeinfo->scan_cnt = 0; -#endif /* CONFIG_DMP_STA_NODE_SCAN_UNDER_AP_MODE */ - /* 20100721:Interrupt scan operation here. */ /* For SW antenna diversity before link, it needs to switch to another antenna and scan again. */ /* It compares the scan result and select beter one to do connection. */ @@ -8885,12 +8852,7 @@ void survey_timer_hdl(_adapter *padapter) if (pmlmeext->sitesurvey_res.state > SCAN_START) { if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) - { -#ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE - if ( padapter->mlmeextpriv.mlmext_info.scan_cnt != RTW_SCAN_NUM_OF_CH ) -#endif /* CONFIG_STA_MODE_SCAN_UNDER_AP_MODE */ - pmlmeext->sitesurvey_res.channel_idx++; - } + pmlmeext->sitesurvey_res.channel_idx++; if (pmlmeext->scan_abort == true) { diff --git a/include/rtw_mlme_ext.h b/include/rtw_mlme_ext.h index 42c63cc..b3c7561 100644 --- a/include/rtw_mlme_ext.h +++ b/include/rtw_mlme_ext.h @@ -390,10 +390,6 @@ struct mlme_ext_info { struct HT_info_element HT_info; WLAN_BSSID_EX network;//join network or bss_network, if in ap mode, it is the same to cur_network.network struct FW_Sta_Info FW_sta_info[NUM_STA]; - -#ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE - u8 scan_cnt; -#endif //CONFIG_STA_MODE_SCAN_UNDER_AP_MODE }; // The channel information about this channel including joining, scanning, and power constraints. @@ -401,9 +397,6 @@ typedef struct _RT_CHANNEL_INFO { u8 ChannelNum; // The channel number. RT_SCAN_TYPE ScanType; // Scan type such as passive or active scan. - //u16 ScanPeriod; // Listen time in millisecond in this channel. - //s32 MaxTxPwrDbm; // Max allowed tx power. - //u32 ExInfo; // Extended Information for this channel. u32 rx_count; }RT_CHANNEL_INFO, *PRT_CHANNEL_INFO;