commit f210a2f498f4854bb00528b9167c5f0d17c37f75
author Dmitry Shmidt <dimitrysh@google.com> Mon Oct 29 16:14:06 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 29 16:14:06 2012 -0700
tree 24a759f1b41bf70557f74ea888247e25c89e03c8
parent dc4a9a1cc479eb06ca7610821aeb126fa1bfec31
parent d73deeecfe9764334b4d151d65d2989de65a9094

am d73deeec: am 54cb0f6f: wpa_supplicant: Try to reject proper BSSID even if not set by the driver

* commit 'd73deeecfe9764334b4d151d65d2989de65a9094':
  wpa_supplicant: Try to reject proper BSSID even if not set by the driver

wpa_supplicant/events.c

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 34300e4..4b1d992 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -2553,7 +2553,10 @@
 
 				wpa_s->reassociate = 1;
 				if (wpa_s->p2p_group_interface == NOT_P2P_GROUP_INTERFACE) {
-					wpa_blacklist_add(wpa_s, data->assoc_reject.bssid);
+					const u8 *bl_bssid = data->assoc_reject.bssid;
+					if (!bl_bssid || is_zero_ether_addr(bl_bssid))
+						bl_bssid = wpa_s->pending_bssid;
+					wpa_blacklist_add(wpa_s, bl_bssid);
 					wpa_supplicant_req_scan(wpa_s, 0, 0);
 				} else {
 					wpa_supplicant_req_scan(wpa_s, 1, 0);