agent: son_slave: use new supported_channels

As part of the new ACTION_APMANAGER_JOINED_NOTIFICATION the hardware supported channels are sent to the son_slave, they need to be saved independently from the hostapd parameters. When the AP Radio Basic Capabilities are sent as part of the ACTION_CONTROL_SLAVE_JOINED_NOTIFICATION message, the hardware supported channels need to be used instead of the hostapd's supported channels Store the hardware supported channels locally in son_slave Use the hardware supported channels for add_ap_radio_basic_capabilities Signed-off-by: Itay Elenzweig <[email protected]>
prplfoundation · Apr 6, 2020 · 547a603 · 547a603
1 parent 5ea7bdd
commit 547a603
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/agent/src/beerocks/slave/son_slave_thread.cpp b/agent/src/beerocks/slave/son_slave_thread.cpp
@@ -1627,6 +1627,11 @@ bool slave_thread::handle_cmdu_ap_manager_message(Socket *sd,
         }
         hostap_params    = notification->params();
         hostap_cs_params = notification->cs_params();
+        hardware_supported_channels.clear();
+        for (int idx = 0; idx < beerocks::message::SUPPORTED_CHANNELS_LENGTH; idx++)
+            hardware_supported_channels.push_back(
+                std::get<1>(notification->supported_channels_list(idx)));
+
         if (slave_state == STATE_WAIT_FOR_AP_MANAGER_JOINED) {
             slave_state = STATE_AP_MANAGER_JOINED;
         } else {
@@ -3386,7 +3391,7 @@ bool slave_thread::slave_fsm(bool &call_slave_select)
 
         std::array<beerocks::message::sWifiChannel, beerocks::message::SUPPORTED_CHANNELS_LENGTH>
             supported_channels;
-        std::copy_n(std::begin(hostap_params.supported_channels), supported_channels.size(),
+        std::copy_n(std::begin(hardware_supported_channels), supported_channels.size(),
                     supported_channels.begin());
 
         if (!tlvf_utils::add_ap_radio_basic_capabilities(cmdu_tx, hostap_params.iface_mac,

diff --git a/agent/src/beerocks/slave/son_slave_thread.h b/agent/src/beerocks/slave/son_slave_thread.h
@@ -200,6 +200,7 @@ class slave_thread : public beerocks::socket_thread {
     sSlaveBackhaulParams backhaul_params;
     beerocks_message::sNodeHostap hostap_params;
     beerocks_message::sApChannelSwitch hostap_cs_params;
+    std::vector<beerocks::message::sWifiChannel> hardware_supported_channels;
     std::vector<wireless_utils::sChannelPreference> channel_preferences;
 
     SocketClient *platform_manager_socket = nullptr;