diff options
| author | CNSS_WLAN Service <cnssbldsw@qualcomm.com> | 2017-08-17 01:55:07 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-08-17 01:55:07 -0700 |
| commit | 99fc592cc5b39e9c56445d5d95c8f8349cda03d8 (patch) | |
| tree | 74986120961b918db873e82ed50ff374165a05f5 | |
| parent | defcf8a7650d3ccf925009314dc8e7446e4fd3c4 (diff) | |
| parent | 1eec5aeca55d6fddf9ba8efddab728bbe90c92d0 (diff) | |
Merge "qcacld-3.0: HT STA is indicated as VHT capable to firmware" into wlan-cld3.driver.lnx.1.1
| -rw-r--r-- | core/mac/src/pe/lim/lim_assoc_utils.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index 578276cc6f85..5f0826cd856c 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -2180,7 +2180,7 @@ lim_add_sta(tpAniSirGlobal mac_ctx, add_sta_params->status = QDF_STATUS_SUCCESS; add_sta_params->respReqd = 1; - /* Update HT Capability */ + /* Update HT/VHT Capability */ if (LIM_IS_AP_ROLE(session_entry) || LIM_IS_IBSS_ROLE(session_entry)) { @@ -2188,6 +2188,22 @@ lim_add_sta(tpAniSirGlobal mac_ctx, add_sta_params->vhtCapable = sta_ds->mlmStaContext.vhtCapability; } +#ifdef FEATURE_WLAN_TDLS + /* SystemRole shouldn't be matter if staType is TDLS peer */ + else if (STA_ENTRY_TDLS_PEER == sta_ds->staType) { + add_sta_params->htCapable = sta_ds->mlmStaContext.htCapability; + add_sta_params->vhtCapable = + sta_ds->mlmStaContext.vhtCapability; + } +#endif + else { + add_sta_params->htCapable = session_entry->htCapability; + add_sta_params->vhtCapable = session_entry->vhtCapability; + + } + pe_debug("StaIdx: %d updateSta: %d htcapable: %d vhtCapable: %d", + add_sta_params->staIdx, add_sta_params->updateSta, + add_sta_params->htCapable, add_sta_params->vhtCapable); /* * 2G-AS platform: SAP associates with HT (11n)clients as 2x1 in 2G and * 2X2 in 5G @@ -2210,22 +2226,6 @@ lim_add_sta(tpAniSirGlobal mac_ctx, } } -#ifdef FEATURE_WLAN_TDLS - /* SystemRole shouldn't be matter if staType is TDLS peer */ - else if (STA_ENTRY_TDLS_PEER == sta_ds->staType) { - add_sta_params->htCapable = sta_ds->mlmStaContext.htCapability; - add_sta_params->vhtCapable = - sta_ds->mlmStaContext.vhtCapability; - } -#endif - else { - add_sta_params->htCapable = session_entry->htCapability; - add_sta_params->vhtCapable = session_entry->vhtCapability; - - } - pe_debug("StaIdx: %d updateSta: %d htcapable: %d vhtCapable: %d", - add_sta_params->staIdx, add_sta_params->updateSta, - add_sta_params->htCapable, add_sta_params->vhtCapable); add_sta_params->greenFieldCapable = sta_ds->htGreenfield; add_sta_params->maxAmpduDensity = sta_ds->htAMpduDensity; |