diff --git a/Kbuild b/Kbuild index dfd44464c056..7112a0690047 100644 --- a/Kbuild +++ b/Kbuild @@ -1868,7 +1868,6 @@ CDEFINES := -DANI_OS_TYPE_ANDROID=6 \ -Werror\ -D__linux__ \ -DSOFTAP_CHANNEL_RANGE \ - -DWLAN_AP_STA_CONCURRENCY \ -DFEATURE_WLAN_SCAN_PNO \ -DWLAN_FEATURE_PACKET_FILTERING \ -DWLAN_ENABLE_AGEIE_ON_SCAN_RESULTS \ diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index 3463e16c0d58..a8795883548f 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -3074,7 +3074,6 @@ enum hdd_dot11_mode { #define CFG_VCC_UL_MAC_LOSS_THRESH_MAX (9) #define CFG_VCC_UL_MAC_LOSS_THRESH_DEFAULT (9) -#ifdef WLAN_AP_STA_CONCURRENCY /* * * gPassiveMaxChannelTimeConc - Maximum passive scan time in milliseconds. @@ -3239,7 +3238,6 @@ enum hdd_dot11_mode { #define CFG_IDLE_TIME_MIN (0) #define CFG_IDLE_TIME_MAX (25) #define CFG_IDLE_TIME_DEFAULT (25) -#endif #define CFG_MAX_PS_POLL_NAME "gMaxPsPoll" #define CFG_MAX_PS_POLL_MIN WNI_CFG_MAX_PS_POLL_STAMIN @@ -14036,7 +14034,6 @@ struct hdd_config { uint32_t nInitialDwellTime; /* in units of milliseconds */ bool initial_scan_no_dfs_chnl; -#ifdef WLAN_AP_STA_CONCURRENCY uint32_t nPassiveMinChnTimeConc; /* in units of milliseconds */ uint32_t nPassiveMaxChnTimeConc; /* in units of milliseconds */ uint32_t nActiveMinChnTimeConc; /* in units of milliseconds */ @@ -14046,7 +14043,6 @@ struct hdd_config { uint32_t min_rest_time_conc; /* In units of milliseconds */ uint32_t idle_time_conc; -#endif uint8_t nMaxPsPoll; diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 594699cafd36..7d6f26b0d2f2 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -751,7 +751,6 @@ struct reg_table_entry g_registry_table[] = { CFG_SCAN_PROBE_REPEAT_TIME_MIN, CFG_SCAN_PROBE_REPEAT_TIME_MAX), -#ifdef WLAN_AP_STA_CONCURRENCY REG_VARIABLE(CFG_PASSIVE_MAX_CHANNEL_TIME_CONC_NAME, WLAN_PARAM_Integer, struct hdd_config, nPassiveMaxChnTimeConc, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -800,7 +799,6 @@ struct reg_table_entry g_registry_table[] = { CFG_IDLE_TIME_DEFAULT, CFG_IDLE_TIME_MIN, CFG_IDLE_TIME_MAX), -#endif REG_VARIABLE(CFG_MAX_PS_POLL_NAME, WLAN_PARAM_Integer, struct hdd_config, nMaxPsPoll, @@ -8550,7 +8548,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx) smeConfig->csrConfig.nActiveMinChnTime = pConfig->nActiveMinChnTime; smeConfig->csrConfig.nPassiveMaxChnTime = pConfig->nPassiveMaxChnTime; smeConfig->csrConfig.nPassiveMinChnTime = pConfig->nPassiveMinChnTime; -#ifdef WLAN_AP_STA_CONCURRENCY smeConfig->csrConfig.nActiveMaxChnTimeConc = pConfig->nActiveMaxChnTimeConc; smeConfig->csrConfig.nActiveMinChnTimeConc = @@ -8563,7 +8560,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx) smeConfig->csrConfig.min_rest_time_conc = pConfig->min_rest_time_conc; smeConfig->csrConfig.idle_time_conc = pConfig->idle_time_conc; -#endif smeConfig->csrConfig.Is11eSupportEnabled = pConfig->b80211eIsEnabled; smeConfig->csrConfig.WMMSupportMode = hdd_to_csr_wmm_mode(pConfig->WmmMode); diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 294093c5da9f..2c2d5e203894 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -3065,9 +3065,7 @@ __wlan_hdd_cfg80211_get_supported_features(struct wiphy *wiphy, fset |= WIFI_FEATURE_TDLS_OFFCHANNEL; } #endif -#ifdef WLAN_AP_STA_CONCURRENCY fset |= WIFI_FEATURE_AP_STA; -#endif fset |= WIFI_FEATURE_RSSI_MONITOR; fset |= WIFI_FEATURE_TX_TRANSMIT_POWER; fset |= WIFI_FEATURE_SET_TX_POWER_LIMIT; diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index af04a58b6ef4..1bad3a459ca0 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1124,13 +1124,11 @@ typedef struct tagCsrConfigParam { uint32_t nActiveMaxChnTime; /* in units of milliseconds */ uint32_t nInitialDwellTime; /* in units of milliseconds */ bool initial_scan_no_dfs_chnl; -#ifdef WLAN_AP_STA_CONCURRENCY uint32_t nPassiveMinChnTimeConc; /* in units of milliseconds */ uint32_t nPassiveMaxChnTimeConc; /* in units of milliseconds */ uint32_t nActiveMinChnTimeConc; /* in units of milliseconds */ uint32_t nActiveMaxChnTimeConc; /* in units of milliseconds */ uint32_t nRestTimeConc; /* in units of milliseconds */ -#endif /*In units of milliseconds*/ uint32_t min_rest_time_conc; /*In units of milliseconds*/ diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 1a58d2ca5ea8..11b357acc44e 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -466,7 +466,6 @@ struct csr_config { uint32_t nInitialDwellTime; /* in units of milliseconds */ bool initial_scan_no_dfs_chnl; -#ifdef WLAN_AP_STA_CONCURRENCY uint32_t nPassiveMinChnTimeConc;/* in units of milliseconds */ uint32_t nPassiveMaxChnTimeConc;/* in units of milliseconds */ uint32_t nActiveMinChnTimeConc; /* in units of milliseconds */ @@ -476,8 +475,6 @@ struct csr_config { uint32_t min_rest_time_conc; /* In units of milliseconds */ uint32_t idle_time_conc; - -#endif /* * in dBm, the max TX power. The actual TX power is the lesser of this * value & 11d. If 11d is disable, the lesser of this & default setting. @@ -682,9 +679,6 @@ struct csr_scanstruct { bool fFirstScanOnly2GChnl; bool fDropScanCmd; /* true means we don't accept scan commands */ -#ifdef WLAN_AP_STA_CONCURRENCY - tDblLinkList scanCmdPendingList; -#endif /* This includes all channels on which candidate APs are found */ struct csr_channel occupiedChannels[CSR_ROAM_SESSION_MAX]; int8_t roam_candidate_count[CSR_ROAM_SESSION_MAX]; diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index f3e93a7d3818..72639bcea8c8 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -1575,7 +1575,6 @@ static void init_config_param(tpAniSirGlobal pMac) CSR_PASSIVE_MAX_CHANNEL_TIME; pMac->roam.configParam.nPassiveMinChnTime = CSR_PASSIVE_MIN_CHANNEL_TIME; -#ifdef WLAN_AP_STA_CONCURRENCY pMac->roam.configParam.nActiveMaxChnTimeConc = CSR_ACTIVE_MAX_CHANNEL_TIME_CONC; pMac->roam.configParam.nActiveMinChnTimeConc = @@ -1587,7 +1586,6 @@ static void init_config_param(tpAniSirGlobal pMac) pMac->roam.configParam.nRestTimeConc = CSR_REST_TIME_CONC; pMac->roam.configParam.min_rest_time_conc = CSR_MIN_REST_TIME_CONC; pMac->roam.configParam.idle_time_conc = CSR_IDLE_TIME_CONC; -#endif pMac->roam.configParam.nTxPowerCap = CSR_MAX_TX_POWER; pMac->roam.configParam.allow_tpc_from_ap = true; pMac->roam.configParam.statsReqPeriodicity = @@ -2716,7 +2714,6 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, cfg_set_int(pMac, WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME, pParam->nPassiveMinChnTime); } -#ifdef WLAN_AP_STA_CONCURRENCY if (pParam->nActiveMaxChnTimeConc) { pMac->roam.configParam.nActiveMaxChnTimeConc = pParam->nActiveMaxChnTimeConc; @@ -2738,7 +2735,6 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, pParam->min_rest_time_conc; pMac->roam.configParam.idle_time_conc = pParam->idle_time_conc; -#endif pMac->roam.configParam.eBand = pParam->eBand; pMac->roam.configParam.uCfgDot11Mode = csr_get_cfg_dot11_mode_from_csr_phy_mode(NULL, @@ -3207,7 +3203,6 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) pParam->nActiveMinChnTime = cfg_params->nActiveMinChnTime; pParam->nPassiveMaxChnTime = cfg_params->nPassiveMaxChnTime; pParam->nPassiveMinChnTime = cfg_params->nPassiveMinChnTime; -#ifdef WLAN_AP_STA_CONCURRENCY pParam->nActiveMaxChnTimeConc = cfg_params->nActiveMaxChnTimeConc; pParam->nActiveMinChnTimeConc = cfg_params->nActiveMinChnTimeConc; pParam->nPassiveMaxChnTimeConc = cfg_params->nPassiveMaxChnTimeConc; @@ -3215,7 +3210,6 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) pParam->nRestTimeConc = cfg_params->nRestTimeConc; pParam->min_rest_time_conc = cfg_params->min_rest_time_conc; pParam->idle_time_conc = cfg_params->idle_time_conc; -#endif pParam->eBand = cfg_params->eBand; pParam->nScanResultAgeCount = cfg_params->agingCount; pParam->bCatRssiOffset = cfg_params->bCatRssiOffset; diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index ac75b2e928ec..a32201691e1c 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -556,7 +556,6 @@ static void csr_set_default_scan_timing(tpAniSirGlobal pMac, tSirScanType scanType, tCsrScanRequest *pScanRequest) { -#ifdef WLAN_AP_STA_CONCURRENCY if (csr_is_any_session_connected(pMac)) { /* Reset passive scan time as per ini parameter. */ cfg_set_int(pMac, WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME, @@ -583,11 +582,12 @@ static void csr_set_default_scan_timing(tpAniSirGlobal pMac, /* Return so that fields set above will not be overwritten. */ return; } -#endif - /* This portion of the code executed if multi-session not supported */ - /* (WLAN_AP_STA_CONCURRENCY not defined) or no multi-session. */ - /* Use the "regular" (non-concurrency) default scan timing. */ + /* + * This portion of the code is executed if no multi-session. + * Use the "regular" (non-concurrency) default scan timing if + * no multi session. + */ cfg_set_int(pMac, WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME, pMac->roam.configParam.nPassiveMaxChnTime); if (pScanRequest->scanType == eSIR_ACTIVE_SCAN) { @@ -601,14 +601,11 @@ static void csr_set_default_scan_timing(tpAniSirGlobal pMac, pScanRequest->minChnTime = pMac->roam.configParam.nPassiveMinChnTime; } -#ifdef WLAN_AP_STA_CONCURRENCY /* No rest time/Idle time if no sessions are connected. */ pScanRequest->restTime = 0; pScanRequest->min_rest_time = 0; pScanRequest->idle_time = 0; - -#endif } static QDF_STATUS @@ -775,7 +772,6 @@ QDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, sme_debug("Setting default min %d and max %d ChnTime", scan_req->minChnTime, scan_req->maxChnTime); } -#ifdef WLAN_AP_STA_CONCURRENCY /* * Need to set restTime/min_Ret_time/idle_time * only if at least one session is connected @@ -792,7 +788,6 @@ QDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, scan_req->minChnTime = cfg_prm->nPassiveMinChnTimeConc; } } -#endif /* Increase dwell time in case P2P Search and Miracast is not present */ if (scan_req->p2pSearch && scan_req->ChannelInfo.numOfChannels == P2P_SOCIAL_CHANNELS && (!(pMac->sme.miracast_value))) { diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index 9723750476f7..34b274d72616 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -44,7 +44,6 @@ #define CSR_ACTIVE_MAX_CHANNEL_TIME 40 #define CSR_ACTIVE_MIN_CHANNEL_TIME 20 -#ifdef WLAN_AP_STA_CONCURRENCY #define CSR_PASSIVE_MAX_CHANNEL_TIME_CONC 110 #define CSR_PASSIVE_MIN_CHANNEL_TIME_CONC 60 @@ -55,8 +54,6 @@ #define CSR_MIN_REST_TIME_CONC 50 #define CSR_IDLE_TIME_CONC 25 -#endif - #define CSR_MAX_NUM_SUPPORTED_CHANNELS 55 #define CSR_MAX_2_4_GHZ_SUPPORTED_CHANNELS 14