commit 849b9c41c9f5969a68eac52434049f7fa85435d8
author Linux Build Service Account <lnxbuild@localhost> Fri Oct 23 04:08:50 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Oct 23 04:08:50 2020 -0700
tree 5db4c003d34066d7316331539265b55e5d15b04c
parent a766a0c6f149cfb8ca217b97c7f935dde970a603
parent ed3e93020ff49c50440cc0e552a3275a35f927ce

Merge "wlan: Advertise host Control Roaming based on FW and Host blacklist feature." into wlan-driver.lnx.1.0.r43-rel

CORE/HDD/src/wlan_hdd_cfg80211.c

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 68cc6b5..07ce96c 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -6134,7 +6134,8 @@
 #endif
 
 #ifdef FEATURE_WLAN_LFR
-    if (sme_IsFeatureSupportedByFW(BSSID_BLACKLIST)) {
+    if (pHddCtx->cfg_ini->bssid_blacklist_timeout &&
+        sme_IsFeatureSupportedByFW(BSSID_BLACKLIST)) {
         fset |= WIFI_FEATURE_CONTROL_ROAMING;
         hddLog(LOG1, FL("CONTROL_ROAMING supported by driver"));
     }