RDKB-60609: Observed 2.4GHz mesh backhaul is not reconfiguring with force apply. (rdkcentral#641)

RDKB-60609: Observed 2.4GHz mesh backhaul is not reconfiguring with force apply.

Impacted Platforms: All RDKB platforms.
Reason for change: 5G vap config is always being pushed due to incorrect subdoc type mapping.

Test Procedure:
1. Load the above mentioned build
2. Execute the below mentioned command,
dmcli eRT setv Device.WiFi.AccessPoint.13.ForceApply bool true
3. If config is not pushed for mesh backhaul 2G, then issue got reproduced.

Risks: Low
Priority: P1

Signed-off-by: sanjayvenkatesan1902@gmail.com
Co-authored-by: Sathish Kumar Gnanasekaran <gsathish86@gmail.com>

Author: SanjayVenkatesan190

source/core/wifi_ctrl.c

@@ -3089,6 +3089,33 @@ void get_subdoc_name_from_vap_index(uint8_t vap_index, int* subdoc)
     }
 }
 
+void get_subdoc_type_name_from_ap_index(uint8_t vap_index, int *subdoc)
+{
+    UINT radio_index = getRadioIndexFromAp(vap_index);
+    wifi_radio_operationParam_t *radioOperation = getRadioOperationParam(radio_index);
+    if (radioOperation == NULL) {
+        wifi_util_error_print(WIFI_CTRL,
+            "%s : failed to getRadioOperationParam for radio index %d\n", __FUNCTION__,
+            radio_index);
+        return;
+    }
+
+    switch (radioOperation->band) {
+    case WIFI_FREQUENCY_2_4_BAND:
+        *subdoc = webconfig_subdoc_type_vap_24G;
+        break;
+    case WIFI_FREQUENCY_5_BAND:
+        *subdoc = webconfig_subdoc_type_vap_5G;
+        break;
+    case WIFI_FREQUENCY_6_BAND:
+        *subdoc = webconfig_subdoc_type_vap_6G;
+        break;
+    default:
+        *subdoc = webconfig_subdoc_type_unknown;
+        break;
+    }
+}
+
 //Returns total number of Configured vaps for all radios
 UINT getTotalNumberVAPs()
 {

source/core/wifi_ctrl.h

@@ -400,6 +400,8 @@ wifi_vap_security_t * Get_wifi_object_bss_security_parameter(uint8_t vapIndex);
 wifi_vap_security_t * Get_wifi_object_sta_security_parameter(uint8_t vapIndex);
 char *get_assoc_devices_blob();
 void get_subdoc_name_from_vap_index(uint8_t vap_index, int* subdoc);
+void get_subdoc_type_name_from_ap_index(uint8_t vap_index, int* subdoc);
+
 int dfs_nop_start_timer(void *args);
 int webconfig_send_full_associate_status(wifi_ctrl_t *ctrl);
 void start_station_vaps(bool enable);

source/core/wifi_ctrl_rbus_handlers.c

@@ -3164,7 +3164,7 @@ bus_error_t set_force_vap_apply(char *name, raw_data_t *p_data, bus_user_data_t
         data->u.decoded.radios[radio_index].vaps.rdk_vap_array[vap_array_index].force_apply =
             force_apply;
 
-        get_subdoc_name_from_vap_index(idx - 1, &subdoc_type);
+        get_subdoc_type_name_from_ap_index(idx - 1, &subdoc_type);
 
         if (webconfig_encode(&ctrl->webconfig, data, subdoc_type) != webconfig_error_none) {
             wifi_util_error_print(WIFI_CTRL, "%s:%d Error in encoding radio stats\n", __func__,