diff options
| author | Steven Laver <lavers@google.com> | 2020-05-04 22:18:20 -0700 |
|---|---|---|
| committer | Steven Laver <lavers@google.com> | 2020-05-06 11:48:56 -0700 |
| commit | 19a172e0208b6d3dcbcdb793107550a6837f79be (patch) | |
| tree | 1646968c9627def5f7144bedca21f1ff51900546 /wifi/1.4/default/wifi_iface_util.cpp | |
| parent | c7b41816dfb92b9f104439a19c78abc4f68971e0 (diff) | |
| parent | 7d054ed1deae08cb23eb54c063c12772e96831fd (diff) | |
Merge RP1A.200504.002
Change-Id: I1c488a4fc4dee824e058a48b606499840cf5a35b
Diffstat (limited to 'wifi/1.4/default/wifi_iface_util.cpp')
| -rw-r--r-- | wifi/1.4/default/wifi_iface_util.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/wifi/1.4/default/wifi_iface_util.cpp b/wifi/1.4/default/wifi_iface_util.cpp index 1d15d2a57b..bb1e5deeab 100644 --- a/wifi/1.4/default/wifi_iface_util.cpp +++ b/wifi/1.4/default/wifi_iface_util.cpp @@ -55,18 +55,22 @@ std::array<uint8_t, 6> WifiIfaceUtil::getFactoryMacAddress( bool WifiIfaceUtil::setMacAddress(const std::string& iface_name, const std::array<uint8_t, 6>& mac) { +#ifndef WIFI_AVOID_IFACE_RESET_MAC_CHANGE if (!iface_tool_.lock()->SetUpState(iface_name.c_str(), false)) { LOG(ERROR) << "SetUpState(false) failed."; return false; } +#endif if (!iface_tool_.lock()->SetMacAddress(iface_name.c_str(), mac)) { LOG(ERROR) << "SetMacAddress failed."; return false; } +#ifndef WIFI_AVOID_IFACE_RESET_MAC_CHANGE if (!iface_tool_.lock()->SetUpState(iface_name.c_str(), true)) { LOG(ERROR) << "SetUpState(true) failed."; return false; } +#endif IfaceEventHandlers event_handlers = {}; const auto it = event_handlers_map_.find(iface_name); if (it != event_handlers_map_.end()) { |