Merge "Revert^2 "Change ifname to interface handle in set_scan_mode api"" into main

This commit is contained in:
Treehugger Robot
2024-05-30 17:19:45 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -2012,7 +2012,7 @@ wifi_error WifiLegacyHal::twtClearStats(const std::string& iface_name, uint8_t c
}
wifi_error WifiLegacyHal::setScanMode(const std::string& iface_name, bool enable) {
return global_func_table_.wifi_set_scan_mode(iface_name.c_str(), enable);
return global_func_table_.wifi_set_scan_mode(getIfaceHandle(iface_name), enable);
}
wifi_error WifiLegacyHal::setDtimConfig(const std::string& iface_name, uint32_t multiplier) {

View File

@@ -1386,7 +1386,7 @@ typedef struct {
* @param enable true if current is scan only mode
* @return Synchronous wifi_error
*/
wifi_error (*wifi_set_scan_mode)(const char * ifname, bool enable);
wifi_error (*wifi_set_scan_mode)(wifi_interface_handle iface, bool enable);
wifi_error (*wifi_nan_pairing_end)(transaction_id id,
wifi_interface_handle iface,