CHROMIUMOS: wpa_supplicant: be smarter about blacklisting bssid on dissasoc/deauth

wpa_supplicant/events.c

 /*
  * WPA Supplicant - Driver event processing
  * Copyright (c) 2003-2010, Jouni Malinen <j@w1.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  *
  * Alternatively, this software may be distributed under the terms of BSD
  * license.
@@ skipping 1260 matching lines @@
         if (wpa_s->wpa_state == WPA_4WAY_HANDSHAKE &&
             wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) {
                 wpa_msg(wpa_s, MSG_INFO, "WPA: 4-Way Handshake failed - "
                         "pre-shared key may be incorrect");
         }
         if (wpa_s->wpa_state >= WPA_ASSOCIATED)
                 wpa_supplicant_req_scan(wpa_s, 0, 100000);
         bssid = wpa_s->bssid;
         if (is_zero_ether_addr(bssid))
                 bssid = wpa_s->pending_bssid;
-        wpa_blacklist_add(wpa_s, bssid);
+        /*
+         * Don't blacklist the AP on normal/expected disconnects.
+         */
+        if (reason_code != WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY &&
+            reason_code != WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA &&
+            reason_code != WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA)
+                wpa_blacklist_add(wpa_s, bssid);
         wpa_sm_notify_disassoc(wpa_s->wpa);
         wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_DISCONNECTED "bssid=" MACSTR
                 " reason=%d",
                 MAC2STR(bssid), reason_code);
         if (wpa_supplicant_dynamic_keys(wpa_s)) {
                 wpa_printf(MSG_DEBUG, "Disconnect event - remove keys");
                 wpa_s->keys_cleared = 0;
                 wpa_clear_keys(wpa_s, wpa_s->bssid);
         }
         wpa_supplicant_mark_disassoc(wpa_s);
@@ skipping 430 matching lines @@
                 break;
         case EVENT_CONNECTION_CHANGE:
                 bgscan_notify_connection_change(wpa_s,
                                                 &data->connection_change);
                 break;
         default:
                 wpa_printf(MSG_INFO, "Unknown event %d", event);
                 break;
         }
 }