commit 78a15382944043900f2c8b49e2a22d297159fc01
author developer <developer@mediatek.com> Wed Nov 02 10:57:40 2022 +0800
committer developer <developer@mediatek.com> Thu Nov 10 11:06:52 2022 +0800
tree 9705fe2762efaaa4eff5d0568678e6685a57e901
parent 026ac9e2e6fa02f03cdb4822fb3e9a6b33a8242c

[rdkb][common][hal][Fix tdk failed]

[Description]
Fix tdk failed.
1. DFS supported only reponse TRUE when input 5g radio index.
2. DFS enable should not consider radio band.
4. Fix case error in getRadioGuardInterval.
5. Fix MCS code bound.
6. Fix rsn_pairwise empty and get EncryptionMode empty bug.

[Release-log]
N/A

Change-Id: I7430cb6f68a2fcaa7431a17fab1d9a685957fb85

src/wifi/wifi_hal.c

diff --git a/src/wifi/wifi_hal.c b/src/wifi/wifi_hal.c
index 478c559..92575ec 100644
--- a/src/wifi/wifi_hal.c
+++ b/src/wifi/wifi_hal.c
@@ -2486,9 +2486,14 @@
 //Check if the driver support the Dfs
 INT wifi_getRadioDfsSupport(INT radioIndex, BOOL *output_bool) //Tr181
 {
+    wifi_band band = band_invalid;
     if (NULL == output_bool) 
         return RETURN_ERR;
-    *output_bool=TRUE;
+    *output_bool=FALSE;
+
+    band = wifi_index_to_band(radioIndex);
+    if (band == band_5)
+        *output_bool = TRUE;
     return RETURN_OK;
 }
 
@@ -2545,7 +2550,6 @@
 {
     char buf[16] = {0};
     FILE *f = NULL;
-    wifi_band band;
 
     WIFI_ENTRY_EXIT_DEBUG("Inside %s:%d\n",__func__, __LINE__);
 
@@ -2553,10 +2557,6 @@
     if (NULL == output_bool) 
         return RETURN_ERR;
 
-    band = wifi_index_to_band(radioIndex);
-    if (band != band_5)
-        return RETURN_OK;
-
     f = fopen(DFS_ENABLE_FILE, "r");
     if (f != NULL) {
         fgets(buf, 2, f);
@@ -2574,14 +2574,9 @@
     char config_file[128] = {0};
     FILE *f = NULL;
     struct params params={0};
-    wifi_band band;
 
     WIFI_ENTRY_EXIT_DEBUG("Inside %s:%d\n",__func__, __LINE__);
 
-    band = wifi_index_to_band(radioIndex);
-    if (band != band_5)
-        return RETURN_OK;
-
     f = fopen(DFS_ENABLE_FILE, "w");
     if (f == NULL)
         return RETURN_ERR;
@@ -2833,7 +2828,7 @@
     else if (GI == wifi_guard_interval_3200)
         strcpy(output_string, "3200nsec");
     else
-        strcpy(output_string, "auto");
+        strcpy(output_string, "Auto");
 
     WIFI_ENTRY_EXIT_DEBUG("Exiting %s:%d\n",__func__, __LINE__);
     return RETURN_OK;
@@ -2920,17 +2915,18 @@
 
     snprintf(config_file, sizeof(config_file), "%s%d.conf", CONFIG_PREFIX, radioIndex);
 
-    if (MCS > 11 || MCS < 0) {
+    // -1 means auto
+    if (MCS > 15 || MCS < -1) {
         fprintf(stderr, "%s: invalid MCS %d\n", __func__, MCS);
         return RETURN_ERR;
     }
 
-    if (MCS <= 7)
-        strcpy(set_value, "0");
-    else if (MCS <= 9)
+    if (MCS > 9 || MCS == -1)
+        strcpy(set_value, "2");
+    else if (MCS > 7)
         strcpy(set_value, "1");
     else
-        strcpy(set_value, "2");
+        strcpy(set_value, "0");
 
     set_config.name = "he_basic_mcs_nss_set";
     set_config.value = set_value;
@@ -5063,8 +5059,12 @@
     else
         return RETURN_ERR;
     memset(output_string,'\0',32);
-    sprintf(config_file,"%s%d.conf",CONFIG_PREFIX,apIndex);
     wifi_hostapdRead(config_file,param_name,output_string,32);
+    if (strlen(output_string) == 0) {       // rsn_pairwise is optional. When it is empty use wpa_pairwise instead.
+        param_name = "wpa_pairwise";
+        memset(output_string, '\0', 32);
+        wifi_hostapdRead(config_file, param_name, output_string, 32);
+    }
     wifi_dbg_printf("\n%s output_string=%s",__func__,output_string);
 
     if(strcmp(output_string,"TKIP") == 0)