nl80211: Ignore Connect failure for the previous association

Suppose there are two APs (AP1 & AP2) and user attempted to connect to
AP2 before the previous connection with AP1 could succeed. Now, if the
connection event comes for the older AP with failed status, we should
just ignore it as the wpa_supplicant state has moved to "ASSOCIATING"
with the new AP (AP2).

This is a similar to the case where a disconnection event is ignored for
a case where local disconnect request can cause the extra event to show
up during the next association process following that command.

Signed-off-by: Jithu Jance <jithu@broadcom.com>

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index fccae11..d429394 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -5440,7 +5440,15 @@ static int wpa_driver_nl80211_connect(
        struct wpa_driver_nl80211_data *drv,
        struct wpa_driver_associate_params *params)
 {
-       int ret = wpa_driver_nl80211_try_connect(drv, params);
+       int ret;
+
+       /* Store the connection attempted bssid for future use */
+       if (params->bssid)
+               os_memcpy(drv->auth_attempt_bssid, params->bssid, ETH_ALEN);
+       else
+               os_memset(drv->auth_attempt_bssid, 0, ETH_ALEN);
+
+       ret = wpa_driver_nl80211_try_connect(drv, params);
        if (ret == -EALREADY) {
                /*
                 * cfg80211 does not currently accept new connections if

diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c
index 9835e28..ab5208e 100644 (file)
--- a/src/drivers/driver_nl80211_event.c
+++ b/src/drivers/driver_nl80211_event.c
@@ -282,6 +282,7 @@ static void mlme_event_connect(struct wpa_driver_nl80211_data *drv,
                               struct nlattr *ptk_kek)
 {
        union wpa_event_data event;
+       u16 status_code;
 
        if (drv->capa.flags & WPA_DRIVER_FLAGS_SME) {
                /*
@@ -293,21 +294,41 @@ static void mlme_event_connect(struct wpa_driver_nl80211_data *drv,
                return;
        }
 
-       if (cmd == NL80211_CMD_CONNECT)
-               wpa_printf(MSG_DEBUG, "nl80211: Connect event");
-       else if (cmd == NL80211_CMD_ROAM)
+       status_code = status ? nla_get_u16(status) : WLAN_STATUS_SUCCESS;
+
+       if (cmd == NL80211_CMD_CONNECT) {
+               wpa_printf(MSG_DEBUG,
+                          "nl80211: Connect event (status=%u ignore_next_local_disconnect=%d)",
+                          status_code, drv->ignore_next_local_disconnect);
+       } else if (cmd == NL80211_CMD_ROAM) {
                wpa_printf(MSG_DEBUG, "nl80211: Roam event");
+       }
 
        os_memset(&event, 0, sizeof(event));
-       if (cmd == NL80211_CMD_CONNECT &&
-           nla_get_u16(status) != WLAN_STATUS_SUCCESS) {
+       if (cmd == NL80211_CMD_CONNECT && status_code != WLAN_STATUS_SUCCESS) {
                if (addr)
                        event.assoc_reject.bssid = nla_data(addr);
+               if (drv->ignore_next_local_disconnect) {
+                       drv->ignore_next_local_disconnect = 0;
+                       if (!event.assoc_reject.bssid ||
+                           (os_memcmp(event.assoc_reject.bssid,
+                                      drv->auth_attempt_bssid,
+                                      ETH_ALEN) != 0)) {
+                               /*
+                                * Ignore the event that came without a BSSID or
+                                * for the old connection since this is likely
+                                * not relevant to the new Connect command.
+                                */
+                               wpa_printf(MSG_DEBUG,
+                                          "nl80211: Ignore connection failure event triggered during reassociation");
+                               return;
+                       }
+               }
                if (resp_ie) {
                        event.assoc_reject.resp_ies = nla_data(resp_ie);
                        event.assoc_reject.resp_ies_len = nla_len(resp_ie);
                }
-               event.assoc_reject.status_code = nla_get_u16(status);
+               event.assoc_reject.status_code = status_code;
                wpa_supplicant_event(drv->ctx, EVENT_ASSOC_REJECT, &event);
                return;
        }