commit 630fa0406bc2d03b162913f9f8582b86847091c1
author developer <developer@mediatek.com> Fri Dec 22 15:01:43 2023 +0800
committer developer <developer@mediatek.com> Fri Dec 22 15:01:43 2023 +0800
tree d16256b05ad44b37005f207bfb26e0b3c0408f6c
parent a47dfe238b0feb0ce7da804e84d7d895091b83a4

[[RDKB]Fix the issue of interface down/up due to set STBC in wifi_setRadioExtChannel]

[Description]
Remove STBC setting in wifi_setRadioExtChannel.

[Release-log]

src/logan_wifi/wifi_hal.c

diff --git a/src/logan_wifi/wifi_hal.c b/src/logan_wifi/wifi_hal.c
index 388cc37..4f1338d 100644
--- a/src/logan_wifi/wifi_hal.c
+++ b/src/logan_wifi/wifi_hal.c
@@ -6796,10 +6796,9 @@
 	char ext_channel[64] = {0};
 	unsigned char ext_ch;
 	char buf[128] = {0};
-	int ret = 0, bss_idx, vap_idx;
+	int ret = 0;
 	long int bandwidth = 0;
 	unsigned long channel = 0;
-	bool stbcEnable = FALSE;
 	params.name = "ht_capab";
 	wifi_band band;
 	int res, main_vap_idx;
@@ -6814,13 +6813,6 @@
 		return RETURN_ERR;
 	}
 
-	res = _syscmd_secure(buf, sizeof(buf), "cat %s | grep STBC", config_file);
-	if(res) {
-		wifi_debug(DEBUG_ERROR, "_syscmd_secure fail\n");
-	}
-
-	if (strlen(buf) != 0)
-		stbcEnable = TRUE;
 	if (wifi_getRadioOperatingChannelBandwidth(radioIndex, buf) != RETURN_OK)
 		return RETURN_ERR;
 	if (hal_strtol(buf, 10, &bandwidth) < 0) {
@@ -6871,19 +6863,6 @@
 	}
 	wifi_datfileWrite(config_dat_file, &params, 1);
 
-	for (bss_idx = 0; bss_idx < LOGAN_MAX_NUM_VAP_PER_RADIO; bss_idx++) {
-		if (array_index_to_vap_index(radioIndex, bss_idx, &vap_idx) != RETURN_OK) {
-			wifi_debug(DEBUG_ERROR, "invalid radioIndex[%d], bss_idx[%d]\n", radioIndex, bss_idx);
-			return RETURN_ERR;
-		}
-		res = snprintf(config_file, sizeof(config_file), "%s%d.conf", CONFIG_PREFIX, vap_idx);
-		if (os_snprintf_error(sizeof(config_file), res)) {
-			wifi_debug(DEBUG_ERROR, "Unexpected snprintf fail\n");
-			return RETURN_ERR;
-		}
-		wifi_setRadioSTBCEnable(vap_idx, stbcEnable);
-	}
-
 	/*do ext_ch quicking setting*/
 	if (ext_ch != -1) {
 		ret = wifi_setChannel_netlink(radioIndex, NULL, NULL, &ext_ch, NULL);
@@ -21401,7 +21380,7 @@
 		rcap->channelWidth[i] |= (WIFI_CHANNELBANDWIDTH_20MHZ |
 								WIFI_CHANNELBANDWIDTH_40MHZ);
 
-	} else if (rcap->band[i] & (WIFI_FREQUENCY_5_BAND ) || rcap->band[i] & (WIFI_FREQUENCY_6_BAND)) {
+	} else if (rcap->band[i] & (WIFI_FREQUENCY_5_BAND )) {
 		rcap->channelWidth[i] |= (WIFI_CHANNELBANDWIDTH_20MHZ |
 								WIFI_CHANNELBANDWIDTH_40MHZ |
 								WIFI_CHANNELBANDWIDTH_80MHZ | WIFI_CHANNELBANDWIDTH_160MHZ);