wifi: fix gts WifiHostTest#testWifiRttCapability test fail issue

PD# 158061

update bcm driver to fix gts test fail

Change-Id: Ie92552284b8c0aa6abbd9160ceeee7947aa6427d

4 files changed, 9 insertions, 4 deletions

diff --git a/bcmdhd.1.579.77.41.1.cn/dhd.h b/bcmdhd.1.579.77.41.1.cn/dhd.h
index bccc5bf..96d774a 100644
--- a/bcmdhd.1.579.77.41.1.cn/dhd.h
+++ b/bcmdhd.1.579.77.41.1.cn/dhd.h
@@ -815,6 +815,7 @@ typedef struct dhd_pub {
 #endif
 #ifdef RTT_SUPPORT
 	void *rtt_state;
+	bool rtt_supported;
 #endif
 	bool	dongle_isolation;
 	bool	is_pcie_watchdog_reset;
diff --git a/bcmdhd.1.579.77.41.1.cn/dhd_config.c b/bcmdhd.1.579.77.41.1.cn/dhd_config.c
index 5fddc37..e062016 100644
--- a/bcmdhd.1.579.77.41.1.cn/dhd_config.c
+++ b/bcmdhd.1.579.77.41.1.cn/dhd_config.c
@@ -65,7 +65,7 @@ uint config_msg_level = CONFIG_ERROR_LEVEL;
 #define CONFIG_BCM4354A1 "config_4354a1.txt"

 #endif

 #define CONFIG_BCM4356A2 "config_4356a2.txt"

-#define CONFIG_BCM4358A3 "config_4358.txt"

+#define CONFIG_BCM4358A3 "config_4358a3.txt"

 #define CONFIG_BCM4359B1 "config_4359b1.txt"

 #define CONFIG_BCM4359C0 "config_4359c0.txt"

 #endif

@@ -89,7 +89,7 @@ uint config_msg_level = CONFIG_ERROR_LEVEL;
 #define FW_BCM43456C5 "fw_bcm43456c5_ag"

 #define FW_BCM4354A1 "fw_bcm4354a1_ag"

 #define FW_BCM4356A2 "fw_bcm4356a2_ag"

-#define FW_BCM4358A3 "fw_bcm4358_ag"

+#define FW_BCM4358A3 "fw_bcm4358a3_ag"

 #define FW_BCM4359B1 "fw_bcm4359b1_ag"

 #define FW_BCM4359C0 "fw_bcm4359c0_ag"

 

diff --git a/bcmdhd.1.579.77.41.1.cn/dhd_linux.c b/bcmdhd.1.579.77.41.1.cn/dhd_linux.c
index 70944f5..66c81e0 100644
--- a/bcmdhd.1.579.77.41.1.cn/dhd_linux.c
+++ b/bcmdhd.1.579.77.41.1.cn/dhd_linux.c
@@ -14130,8 +14130,10 @@ dhd_dev_get_feature_set(struct net_device *dev)
 			feature_set |= WIFI_FEATURE_D2D_RTT;
 	}
 #ifdef RTT_SUPPORT
-	feature_set |= WIFI_FEATURE_D2D_RTT;
-	feature_set |= WIFI_FEATURE_D2AP_RTT;
+	if (dhd->rtt_supported) {
+		feature_set |= WIFI_FEATURE_D2D_RTT;
+		feature_set |= WIFI_FEATURE_D2AP_RTT;
+	}
 #endif /* RTT_SUPPORT */
 #ifdef LINKSTAT_SUPPORT
 	feature_set |= WIFI_FEATURE_LINKSTAT;
diff --git a/bcmdhd.1.579.77.41.1.cn/dhd_rtt.c b/bcmdhd.1.579.77.41.1.cn/dhd_rtt.c
index c58ca93..cd35624 100644
--- a/bcmdhd.1.579.77.41.1.cn/dhd_rtt.c
+++ b/bcmdhd.1.579.77.41.1.cn/dhd_rtt.c
@@ -2305,6 +2305,7 @@ dhd_rtt_init(dhd_pub_t *dhd)
 	int32 version;
 	rtt_status_info_t *rtt_status;
 	NULL_CHECK(dhd, "dhd is NULL", err);
+	dhd->rtt_supported = FALSE;
 	if (dhd->rtt_state) {
 		return err;
 	}
@@ -2331,6 +2332,7 @@ dhd_rtt_init(dhd_pub_t *dhd)
 	ret = dhd_rtt_get_version(dhd, &version);
 	if (ret == BCME_OK && (version == WL_PROXD_API_VERSION)) {
 		DHD_ERROR(("%s : FTM is supported\n", __FUNCTION__));
+		dhd->rtt_supported = TRUE;
 		/* rtt_status->rtt_capa.proto |= RTT_CAP_ONE_WAY; */
 		rtt_status->rtt_capa.proto |= RTT_CAP_FTM_WAY;