agent: remove unused onboarding configuration

Remove unused "onboarding" configuration from "sPlatformSettings" struct. Replace the use of "onboarding" with false value. Removing of the config from the tlvf will take place on future commit. PPM-338 Signed-off-by: Oren Vormaser <[email protected]>
prplfoundation · Aug 11, 2020 · eb6bccf · eb6bccf
1 parent 70c251f
commit eb6bccf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/agent/src/beerocks/slave/platform_manager/platform_manager_thread.cpp b/agent/src/beerocks/slave/platform_manager/platform_manager_thread.cpp
@@ -191,7 +191,6 @@ static bool fill_platform_settings(
     db->device_conf.local_gw = (platform_common_conf.operating_mode == BPL_OPER_MODE_GATEWAY ||
                                 platform_common_conf.operating_mode == BPL_OPER_MODE_GATEWAY_WISP);
 
-    msg->platform_settings().onboarding          = uint8_t(platform_common_conf.onboarding);
     db->device_conf.dfs_reentry_enabled          = uint8_t(platform_common_conf.dfs_reentry);
     db->device_conf.rdkb_extensions_enabled      = uint8_t(platform_common_conf.rdkb_extensions);
     db->device_conf.client_band_steering_enabled = uint8_t(platform_common_conf.band_steering);
@@ -216,7 +215,7 @@ static bool fill_platform_settings(
     db->device_conf.service_fairness_enabled = 0; // for v1.3 TODO read from CAL DB
 
     LOG(DEBUG) << "iface " << iface_name << " settings:";
-    LOG(DEBUG) << "onboarding: " << (unsigned)msg->platform_settings().onboarding;
+    LOG(DEBUG) << "onboarding: " << (unsigned)0;
     LOG(DEBUG) << "client_band_steering_enabled: "
                << (unsigned)db->device_conf.client_band_steering_enabled;
     LOG(DEBUG) << "client_optimal_path_roaming_enabled: "

diff --git a/agent/src/beerocks/slave/son_slave_thread.cpp b/agent/src/beerocks/slave/son_slave_thread.cpp
@@ -2974,7 +2974,7 @@ bool slave_thread::slave_fsm(bool &call_slave_select)
                                   config.hostap_iface.c_str(), message::IFACE_NAME_LENGTH);
 
         request->sta_iface_filter_low() = config.backhaul_wireless_iface_filter_low;
-        request->onboarding()           = platform_settings.onboarding;
+        request->onboarding()           = 0;
         request->certification_mode()   = db->device_conf.certification_mode;
 
         LOG(INFO) << "ACTION_BACKHAUL_REGISTER_REQUEST "
@@ -3003,12 +3003,8 @@ bool slave_thread::slave_fsm(bool &call_slave_select)
     case STATE_JOIN_INIT: {
 
         auto db = AgentDB::get();
-        LOG(DEBUG) << "onboarding: " << int(platform_settings.onboarding);
-        if (platform_settings.onboarding) {
-            LOG(TRACE) << "goto STATE_ONBOARDING";
-            slave_state = STATE_ONBOARDING;
-            break;
-        } else if (!wlan_settings.band_enabled) {
+        LOG(DEBUG) << "onboarding: " << int(0);
+        if (!wlan_settings.band_enabled) {
             LOG(DEBUG) << "wlan_settings.band_enabled=false";
             LOG(TRACE) << "goto STATE_BACKHAUL_ENABLE";
             slave_state = STATE_BACKHAUL_ENABLE;