Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases 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
parent 7fa2e6b058 9e1ee9bb30
commit b0a9ef07bb
1 changed files with 4 additions and 0 deletions
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};
}