driver_nl80211: Fix MLME key settings for static WEP

[thirdparty/hostap.git] / wpa_supplicant / events.c

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index de4c6fb5e17d25af70fab9a568a1fe6f7fa81ccd..e2c7a9fd86d02a2c690d87d907fc6bce72e8423d 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -889,6 +889,7 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
        u8 bssid[ETH_ALEN];
        int ft_completed = wpa_ft_is_completed(wpa_s->wpa);
        int bssid_changed;
+       struct wpa_driver_capa capa;
 
        if (data)
                wpa_supplicant_event_associnfo(wpa_s, data);
@@ -1004,6 +1005,14 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
                        wpa_s->bgscan_ssid = NULL;
        }
 #endif /* CONFIG_BGSCAN */
+
+       if ((wpa_s->key_mgmt == WPA_KEY_MGMT_NONE ||
+            wpa_s->key_mgmt == WPA_KEY_MGMT_IEEE8021X_NO_WPA) &&
+           wpa_s->current_ssid && wpa_drv_get_capa(wpa_s, &capa) == 0 &&
+           capa.flags & WPA_DRIVER_FLAGS_SET_KEYS_AFTER_ASSOC_DONE) {
+               /* Set static WEP keys again */
+               wpa_set_wep_keys(wpa_s, wpa_s->current_ssid);
+       }
 }