tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolve merge conflicts of 9e1ee9bb30 to master

Browse source 
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Iad05fce7dfa8832ed7c62326a908ab52b05268e0
This commit is contained in:
Colin Cross 2020-12-03 14:29:27 -08:00
commit b0a9ef07bb
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wifi/1.5/default/wifi_sta_iface.cpp
View file

@ -648,6 +648,10 @@ std::pair<WifiStatus, std::array<uint8_t, 6>>
WifiStaIface::getFactoryMacAddressInternal() {
std::array<uint8_t, 6> mac =
iface_util_.lock()->getFactoryMacAddress(ifname_);
if (mac[0] == 0 && mac[1] == 0 && mac[2] == 0 && mac[3] == 0 &&
mac[4] == 0 && mac[5] == 0) {
return {createWifiStatus(WifiStatusCode::ERROR_UNKNOWN), mac};
}
return {createWifiStatus(WifiStatusCode::SUCCESS), mac};
}