Merge changes from topics "presubmit-am-199afe44c7a248abae070cf5d976833e", "presubmit-am-eae8cb1f01f04fa1bdbe809fafb5a9ff" into tm-dev
* changes:
Allow to set IF_OPER_UP in kernel
Fixed the number of elements passed to resolvePath()
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 5d4f71e..6e3f614 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -1286,7 +1286,6 @@
} else if (ifi->ifi_flags & IFF_UP) {
/* Re-read MAC address as it may have changed */
nl80211_refresh_mac(drv, ifi->ifi_index, 1);
- return;
}
/*
diff --git a/wpa_supplicant/aidl/supplicant.cpp b/wpa_supplicant/aidl/supplicant.cpp
index 208491c..ee6f809 100644
--- a/wpa_supplicant/aidl/supplicant.cpp
+++ b/wpa_supplicant/aidl/supplicant.cpp
@@ -144,7 +144,8 @@
return -1;
}
const char* path =
- resolvePath(kTemplateConfPaths, sizeof(kTemplateConfPaths));
+ resolvePath(kTemplateConfPaths,
+ sizeof(kTemplateConfPaths)/sizeof(kTemplateConfPaths[0]));
if (path != nullptr) {
ret = copyFileIfItExists(path, config_file_path);
if (ret == 0) {
@@ -342,7 +343,7 @@
iface_params.confname = kP2pIfaceConfPath;
const char* path = resolvePath(
kP2pIfaceConfOverlayPaths,
- sizeof(kP2pIfaceConfOverlayPaths));
+ sizeof(kP2pIfaceConfOverlayPaths)/sizeof(kP2pIfaceConfOverlayPaths[0]));
if (path != nullptr) {
iface_params.confanother = path;
}
@@ -402,7 +403,7 @@
iface_params.confname = kStaIfaceConfPath;
const char* path = resolvePath(
kStaIfaceConfOverlayPaths,
- sizeof(kStaIfaceConfOverlayPaths));
+ sizeof(kStaIfaceConfOverlayPaths)/sizeof(kStaIfaceConfOverlayPaths[0]));
if (path != nullptr) {
iface_params.confanother = path;
}