diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-10-01 03:53:22 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2020-10-01 03:53:22 -0700 |
| commit | 9218d33a2bbdff06eea5f093dd27b54a5257622d (patch) | |
| tree | 1dc5d40d7c4c32e998090488f87c8f6cd8e60e4b | |
| parent | ef7ae69adf924da8b4a76f3aab6921c32900b9bb (diff) | |
| parent | 47fdec12cec5fe0761def3304361bfc3e2bae6ff (diff) | |
Merge 47fdec12cec5fe0761def3304361bfc3e2bae6ff on remote branch
Change-Id: I1e3ea07248c72ef815fc298bd2f04c85afeca134
| -rw-r--r-- | core/hdd/src/wlan_hdd_main.c | 6 | ||||
| -rw-r--r-- | core/mac/inc/qwlan_version.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index b516be33874a..07235498e547 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -1242,8 +1242,12 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, enable_tx_stbc = pconfig->enableTxSTBC; - if (pconfig->enable2x2 && (cfg->num_rf_chains == 2)) + if (pconfig->enable2x2 && (cfg->num_rf_chains == 2)) { pconfig->enable2x2 = 1; + } else { + pconfig->enable2x2 = 0; + enable_tx_stbc = 0; + } if (!(cfg->ht_tx_stbc && pconfig->enable2x2)) enable_tx_stbc = 0; diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index a007c98b67f9..3abcf1db3726 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -32,9 +32,9 @@ #define QWLAN_VERSION_MAJOR 5 #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 1 -#define QWLAN_VERSION_EXTRA "U" +#define QWLAN_VERSION_EXTRA "V" #define QWLAN_VERSION_BUILD 77 -#define QWLAN_VERSIONSTR "5.1.1.77U" +#define QWLAN_VERSIONSTR "5.1.1.77V" #endif /* QWLAN_VERSION_H */ |