aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2012-10-29 13:12:24 -0700
committerDmitry Shmidt <dimitrysh@google.com>2012-10-29 13:54:20 -0700
commit54cb0f6fef5a8ffe2dc7ed98b274fe81ca84c431 (patch)
tree24a759f1b41bf70557f74ea888247e25c89e03c8 /wpa_supplicant
parentb485b188f853a4ec5342c2ea49705b545b2caf3d (diff)
downloadexternal_wpa_supplicant_8-54cb0f6fef5a8ffe2dc7ed98b274fe81ca84c431.zip
external_wpa_supplicant_8-54cb0f6fef5a8ffe2dc7ed98b274fe81ca84c431.tar.gz
external_wpa_supplicant_8-54cb0f6fef5a8ffe2dc7ed98b274fe81ca84c431.tar.bz2
wpa_supplicant: Try to reject proper BSSID even if not set by the driver
Bug: 7423119 Change-Id: Id0266274c9c60f8eea872ca3cfa5ad40d9180789 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/events.c5
1 files changed, 4 insertions, 1 deletions
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 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
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);