From 7b8218c406250560f2479612e335e9c80de99795 Mon Sep 17 00:00:00 2001 From: Lincoln Tran Date: Sun, 18 Oct 2020 15:12:48 -0700 Subject: [PATCH] qcacld-3.0: Update default band to include all bands Currently, QCA_SETBAND_AUTO is backwards compatible, so it is set to include only 2G and 5G bands. Update this to include 6G bands as well. Also update the band capability INI to have the default value 0 include 6G bands. Change-Id: I98067c18e939ff4c1e7b1e778b020b44409b5b34 CRs-fixed: 2799883 --- components/mlme/core/src/wlan_mlme_main.c | 2 +- components/mlme/dispatcher/inc/cfg_mlme_generic.h | 2 +- core/hdd/src/wlan_hdd_regulatory.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/mlme/core/src/wlan_mlme_main.c b/components/mlme/core/src/wlan_mlme_main.c index 6c2659da648f..22b776a0bac4 100644 --- a/components/mlme/core/src/wlan_mlme_main.c +++ b/components/mlme/core/src/wlan_mlme_main.c @@ -358,7 +358,7 @@ static void mlme_init_generic_cfg(struct wlan_objmgr_psoc *psoc, gen->band_capability = cfg_get(psoc, CFG_BAND_CAPABILITY); if (!gen->band_capability) - gen->band_capability = (BIT(REG_BAND_2G) | BIT(REG_BAND_5G)); + gen->band_capability = REG_BAND_MASK_ALL; gen->band = gen->band_capability; gen->select_5ghz_margin = cfg_get(psoc, CFG_SELECT_5GHZ_MARGIN); diff --git a/components/mlme/dispatcher/inc/cfg_mlme_generic.h b/components/mlme/dispatcher/inc/cfg_mlme_generic.h index 7ccda8a4337a..48b1dfc3fd76 100644 --- a/components/mlme/dispatcher/inc/cfg_mlme_generic.h +++ b/components/mlme/dispatcher/inc/cfg_mlme_generic.h @@ -140,7 +140,7 @@ /* * - * BandCapability - Preferred band (0: Both 2.4G and 5G, + * BandCapability - Preferred band (0: 2.4G, 5G, and 6G, * 1: 2.4G only, * 2: 5G only, * 3: Both 2.4G and 5G, diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c index 89fdb6630df6..f462c22dff54 100644 --- a/core/hdd/src/wlan_hdd_regulatory.c +++ b/core/hdd/src/wlan_hdd_regulatory.c @@ -764,7 +764,7 @@ uint32_t hdd_reg_legacy_setband_to_reg_wifi_band_bitmap(uint8_t qca_setband) switch (qca_setband) { case QCA_SETBAND_AUTO: - band_bitmap |= (BIT(REG_BAND_2G) | BIT(REG_BAND_5G)); + band_bitmap |= REG_BAND_MASK_ALL; break; case QCA_SETBAND_5G: band_bitmap |= BIT(REG_BAND_5G);