Merge "IWifi: Validate dedicated NAN discovery interface." into rvc-dev (ecec92b7) · Commits · e / os / android_hardware_interfaces

wifi/1.4/default/wifi_chip.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		#include <android-base/logging.h>
		#include <android-base/unique_fd.h>
		#include <cutils/properties.h>
		#include <net/if.h>
		#include <sys/stat.h>
		#include <sys/sysmacros.h>

		@@ -885,7 +886,7 @@ std::pair<WifiStatus, sp<IWifiNanIface>> WifiChip::createNanIfaceInternal() {
		}
		bool is_dedicated_iface = true;
		std::string ifname = getNanIfaceName();
		if (ifname.empty()) {
		if (ifname.empty() \|\| if_nametoindex(ifname.c_str())) {
		// Use the first shared STA iface (wlan0) if a dedicated aware iface is
		// not defined.
		ifname = getFirstActiveWlanIfaceName();