@@ -1537,9 +1537,9 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s,
}
wpa_supplicant_set_state(wpa_s, WPA_ASSOCIATING);
+ params.ssid = ssid->ssid;
+ params.ssid_len = ssid->ssid_len;
if (bss) {
- params.ssid = bss->ssid;
- params.ssid_len = bss->ssid_len;
if (!wpas_driver_bss_selection(wpa_s) || ssid->bssid_set) {
wpa_printf(MSG_DEBUG, "Limit connection to BSSID "
MACSTR " freq=%u MHz based on scan results "
@@ -1549,9 +1549,6 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s,
params.bssid = bss->bssid;
params.freq = bss->freq;
}
- } else {
- params.ssid = ssid->ssid;
- params.ssid_len = ssid->ssid_len;
}
if (ssid->mode == WPAS_MODE_IBSS && ssid->bssid_set &&