aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk2
-rw-r--r--wpa_supplicant/ctrl_iface.c7
-rw-r--r--wpa_supplicant/wpa_supplicant_template.conf5
3 files changed, 8 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index 77d72ea..90236f2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,3 @@
-ifeq ($(WPA_SUPPLICANT_VERSION),VER_0_8_X)
+ifeq ($(WPA_SUPPLICANT_VERSION),VER_0_8_X_TI)
include $(call all-subdir-makefiles)
endif
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 4f0aa33..81cd363 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -2665,6 +2665,13 @@ static int print_bss_info(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
}
#endif /* CONFIG_INTERWORKING */
+#ifdef ANDROID
+ ret = os_snprintf(pos, end - pos, "====\n");
+ if (ret < 0 || ret >= end - pos)
+ return 0;
+ pos += ret;
+#endif
+
return pos - buf;
}
diff --git a/wpa_supplicant/wpa_supplicant_template.conf b/wpa_supplicant/wpa_supplicant_template.conf
index 17d4b18..e99525d 100644
--- a/wpa_supplicant/wpa_supplicant_template.conf
+++ b/wpa_supplicant/wpa_supplicant_template.conf
@@ -4,11 +4,6 @@ ctrl_interface=wlan0
eapol_version=1
ap_scan=1
fast_reauth=1
-device_name=Blaze
-manufacturer=TI
-model_name=Wilink
-model_number=wl18xx
-serial_number=12345
p2p_conc_mode=2
driver_param=use_p2p_group_interface=1
p2p_go_max_inactivity=60