summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Norman <danielnorman@google.com>2019-01-29 16:38:32 -0800
committerBruno Martins <bgcngm@gmail.com>2020-04-17 20:40:45 +0200
commitfffeb14cdb594c606cbcef9c5a08682cca6a76a7 (patch)
treec1513119ea65b824c0eaef6ea2d582f59a711042
parentd9bd4d1997718cc0b100015141c7871bdd8275f6 (diff)
downloadandroid_hardware_interfaces-fffeb14cdb594c606cbcef9c5a08682cca6a76a7.tar.gz
android_hardware_interfaces-fffeb14cdb594c606cbcef9c5a08682cca6a76a7.tar.bz2
android_hardware_interfaces-fffeb14cdb594c606cbcef9c5a08682cca6a76a7.zip
Fix build errors.
- wifi_chip: getWlan0IfaceName was replaced with a generic getWlanIfaceName(idx) Change-Id: I4053d183b8ebf6d7b482d3dab034ed9f6a78b4d8
-rw-r--r--wifi/1.3/default/wifi_chip.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/wifi/1.3/default/wifi_chip.cpp b/wifi/1.3/default/wifi_chip.cpp
index 2dcc33cfb..2b137498b 100644
--- a/wifi/1.3/default/wifi_chip.cpp
+++ b/wifi/1.3/default/wifi_chip.cpp
@@ -813,7 +813,7 @@ std::pair<WifiStatus, sp<IWifiApIface>> WifiChip::createApIfaceInternal() {
std::string ifname = allocateApIfaceName();
if (!if_nametoindex(ifname.c_str())) {
legacy_hal::wifi_error legacy_status =
- legacy_hal_.lock()->QcAddInterface(getWlan0IfaceName(), ifname,
+ legacy_hal_.lock()->QcAddInterface(getWlanIfaceName(0), ifname,
(uint32_t)IfaceType::AP);
if (legacy_status != legacy_hal::WIFI_SUCCESS) {
LOG(ERROR) << "Failed to add interface: " << ifname << " "
@@ -860,7 +860,7 @@ WifiStatus WifiChip::removeApIfaceInternal(const std::string& ifname) {
if (findUsingName(created_ap_ifaces_, ifname) != nullptr) {
legacy_hal::wifi_error legacy_status =
- legacy_hal_.lock()->QcRemoveInterface(getWlan0IfaceName(), ifname);
+ legacy_hal_.lock()->QcRemoveInterface(getWlanIfaceName(0), ifname);
if (legacy_status != legacy_hal::WIFI_SUCCESS) {
LOG(ERROR) << "Failed to remove interface: " << ifname << " "
<< legacyErrorToString(legacy_status);
@@ -983,7 +983,7 @@ std::pair<WifiStatus, sp<IWifiStaIface>> WifiChip::createStaIfaceInternal() {
std::string ifname = allocateStaIfaceName();
if (!if_nametoindex(ifname.c_str())) {
legacy_hal::wifi_error legacy_status =
- legacy_hal_.lock()->QcAddInterface(getWlan0IfaceName(), ifname,
+ legacy_hal_.lock()->QcAddInterface(getWlanIfaceName(0), ifname,
(uint32_t)IfaceType::STA);
if (legacy_status != legacy_hal::WIFI_SUCCESS) {
LOG(ERROR) << "Failed to add interface: " << ifname << " "
@@ -1028,7 +1028,7 @@ WifiStatus WifiChip::removeStaIfaceInternal(const std::string& ifname) {
}
if (findUsingName(created_sta_ifaces_, ifname) != nullptr) {
legacy_hal::wifi_error legacy_status =
- legacy_hal_.lock()->QcRemoveInterface(getWlan0IfaceName(), ifname);
+ legacy_hal_.lock()->QcRemoveInterface(getWlanIfaceName(0), ifname);
if (legacy_status != legacy_hal::WIFI_SUCCESS) {
LOG(ERROR) << "Failed to remove interface: " << ifname << " "
<< legacyErrorToString(legacy_status);