am a4d23b81: Enable broadcom-specific patch with proper flag
* commit 'a4d23b8131874ba2380817014f9190b737ce785d':
Enable broadcom-specific patch with proper flag
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 6f6aff6..4f555a0 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -13,6 +13,8 @@
# To ignore possible wrong network configurations
L_CFLAGS = -DWPA_IGNORE_CONFIG_ERRORS
+L_CFLAGS += -DVERSION_STR_POSTFIX=\"-$(PLATFORM_VERSION)\"
+
# Set Android log name
L_CFLAGS += -DANDROID_LOG_NAME=\"hostapd\"
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 50f8dd7..f1ef67f 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -31,6 +31,8 @@
# To ignore possible wrong network configurations
L_CFLAGS = -DWPA_IGNORE_CONFIG_ERRORS
+L_CFLAGS += -DVERSION_STR_POSTFIX=\"-$(PLATFORM_VERSION)\"
+
# Set Android log name
L_CFLAGS += -DANDROID_LOG_NAME=\"wpa_supplicant\"
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index 69fa99f..bb64e9a 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -504,6 +504,7 @@
*/
void wpa_supplicant_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec)
{
+#ifndef ANDROID
/* If there's at least one network that should be specifically scanned
* then don't cancel the scan and reschedule. Some drivers do
* background scanning which generates frequent scan results, and that
@@ -525,7 +526,7 @@
return;
}
}
-
+#endif
wpa_dbg(wpa_s, MSG_DEBUG, "Setting scan request: %d sec %d usec",
sec, usec);
eloop_cancel_timeout(wpa_supplicant_scan, wpa_s, NULL);