[BugFix][API-972]fix wpa_supplicant sometimes no event or msg return
Change-Id: I983d58e3936a38edce38450e52013a0ce31e6bd9
diff --git a/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd/Makefile b/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd/Makefile
index 00b81ea..496698c 100755
--- a/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd/Makefile
+++ b/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd/Makefile
@@ -139,6 +139,7 @@
# for TDLS RSSI HIGH for tearing down TDLS link
DHDCFLAGS += -DCUSTOM_TDLS_RSSI_THRESHOLD_LOW=-85
+DHDCFLAGS += -DDISABLE_FW_ROAM
# Roaming
DHDCFLAGS += -DROAM_AP_ENV_DETECTION
DHDCFLAGS += -DROAM_ENABLE -DROAM_CHANNEL_CACHE -DROAM_API
diff --git a/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd/dhd_linux.c b/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd/dhd_linux.c
index c020db9..1d0bdc4 100755
--- a/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd/dhd_linux.c
+++ b/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd/dhd_linux.c
@@ -10327,7 +10327,11 @@
wl_el_tag_params_t *el_tag = NULL;
#endif /* DHD_8021X_DUMP */
#ifdef ROAM_ENABLE
+#ifdef DISABLE_FW_ROAM
+ uint roamvar = 1;
+#else
uint roamvar = 0;
+#endif
int roam_trigger[2] = {CUSTOM_ROAM_TRIGGER_SETTING, WLC_BAND_ALL};
int roam_scan_period[2] = {10, WLC_BAND_ALL};
int roam_delta[2] = {CUSTOM_ROAM_DELTA_SETTING, WLC_BAND_ALL};
diff --git a/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd/wl_cfg80211.c
index 5735440..9c21309 100755
--- a/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd/wl_cfg80211.c
+++ b/src/kernel/linux/v4.19/drivers/net/wireless/bcmdhd/wl_cfg80211.c
@@ -177,7 +177,11 @@
#endif /* WL_FW_OCE_AP_SELECT && (ROAM_ENABLE || BCMFW_ROAM_ENABLE) */
module_param(fw_ap_select, uint, 0660);
/* this flag enable triggerrs bgscan method from supplicant */
+#ifdef DISABLE_FW_ROAM
+uint us_ap_select = true;
+#else
uint us_ap_select = false;
+#endif
module_param(us_ap_select, uint, 0660);
static struct device *cfg80211_parent_dev = NULL;
@@ -2443,6 +2447,11 @@
/* Enable buffering of PTK key till EAPOL 4/4 is sent out */
wldev_iovar_setint(ndev, "buf_key_b4_m4", 1);
}
+#ifdef DISABLE_FW_ROAM
+ if (wl_iftype == WL_IF_TYPE_STA){
+ wldev_iovar_setint(ndev,"roam_off",1);
+ }
+#endif
break;
default: