summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGupta, Kapil <kapgupta@qti.qualcomm.com>2016-05-11 13:46:16 +0530
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2016-05-16 16:47:55 +0530
commit2955d6e0cdfc3fd1ea5d4369f3727592cd635ac3 (patch)
tree248268322e969d5a5a987bbe1ceae20398819bc8
parent2ea34b3b2aff323d386f86b601b44afb1863f0ed (diff)
qcacld-2.0: Correct chainmask for start bss
In case of dynamic chain mask for SAP case, driver does not update correct chain mask due to station specific validation. Move the validation to station related code. Change-Id: I2d75610457e157acc2a3d7445a5f39b16eaf2007 CRs-Fixed: 1014181
-rw-r--r--CORE/HDD/src/wlan_hdd_main.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 5466e894d7fc..e440eb33b481 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -5030,14 +5030,8 @@ void hdd_decide_dynamic_chain_mask(hdd_context_t *hdd_ctx,
hdd_ctx->cfg_ini->enable_dynamic_sta_chainmask);
return;
}
- sta_adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_INFRA_STATION);
- if (!sta_adapter) {
- hddLog(LOGE, FL("Sta adapter null!!"));
- return;
- }
hddLog(LOG1, FL("Current antenna mode: %d"),
hdd_ctx->current_antenna_mode);
- hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(sta_adapter);
if (HDD_ANTENNA_MODE_INVALID != forced_mode) {
mode = forced_mode;
@@ -5046,6 +5040,13 @@ void hdd_decide_dynamic_chain_mask(hdd_context_t *hdd_ctx,
mode = HDD_ANTENNA_MODE_1X1;
} else if (1 == wlan_hdd_get_active_session_count(hdd_ctx) &&
hdd_ctx->no_of_active_sessions[WLAN_HDD_INFRA_STATION]) {
+ sta_adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_INFRA_STATION);
+ if (!sta_adapter) {
+ hddLog(LOGE, FL("Sta adapter null!!"));
+ return;
+ }
+ hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(sta_adapter);
+
if (!hdd_connIsConnected(hdd_sta_ctx)) {
hddLog(LOGE, FL("Sta not connected"));
return;