Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6442e4a7 authored by Mahesh KKV's avatar Mahesh KKV Committed by Android (Google) Code Review
Browse files

Merge "Fix multi-link llstat parsing in wifi legacy hal"

parents 4496bcd4 dec38700

wifi/aidl/default/wifi_legacy_hal.cpp

+2 −2
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ wifi_error WifiLegacyHal::disableLinkLayerStats(const std::string& iface_name) { 


// Copies wifi_peer_info* to vector<WifiPeerInfo> and returns poiner to next element.

wifi_peer_info* WifiLegacyHal::copyPeerInfo(wifi_peer_info* peer_ptr,

                                            std::vector<WifiPeerInfo> peers) {

                                            std::vector<WifiPeerInfo>& peers) {

    WifiPeerInfo peer;

    peer.peer_info = *peer_ptr;

    if (peer_ptr->num_rate > 0) {
@@ -770,7 +770,7 @@ wifi_peer_info* WifiLegacyHal::copyPeerInfo(wifi_peer_info* peer_ptr, 
}

// Copies wifi_link_stat* to vector<LinkStats> and returns poiner to next element.

wifi_link_stat* WifiLegacyHal::copyLinkStat(wifi_link_stat* stat_ptr,

                                            std::vector<LinkStats> stats) {

                                            std::vector<LinkStats>& stats) {

    LinkStats linkStat;

    linkStat.stat = *stat_ptr;

    wifi_peer_info* l_peer_info_stats_ptr = stat_ptr->peer_info;

wifi/aidl/default/wifi_legacy_hal.h

+2 −2
Original line number Diff line number Diff line
@@ -792,8 +792,8 @@ class WifiLegacyHal { 
    // Handles wifi (error) status of Virtual interface create/delete

    wifi_error handleVirtualInterfaceCreateOrDeleteStatus(const std::string& ifname,

                                                          wifi_error status);

    wifi_link_stat* copyLinkStat(wifi_link_stat* stat_ptr, std::vector<LinkStats> stats);

    wifi_peer_info* copyPeerInfo(wifi_peer_info* peer_ptr, std::vector<WifiPeerInfo> peers);

    wifi_link_stat* copyLinkStat(wifi_link_stat* stat_ptr, std::vector<LinkStats>& stats);

    wifi_peer_info* copyPeerInfo(wifi_peer_info* peer_ptr, std::vector<WifiPeerInfo>& peers);



    // Global function table of legacy HAL.

    wifi_hal_fn global_func_table_;