X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=hostapd%2Fhostapd.c;h=225ad3abfd8ad42d58957bb6bb1c831227951719;hb=f07688e37da087d290991ca3942085628f9e954d;hp=681ebbfd0b5637f830e4290742702cb774f5acbd;hpb=95da9bbc364778c4cc72dff9d60f74bc1dbdfbb5;p=wpasupplicant

diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index 681ebbf..225ad3a 100644
--- a/hostapd/hostapd.c
+++ b/hostapd/hostapd.c
@@ -254,7 +254,8 @@ void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
 	/* Start IEEE 802.1X authentication process for new stations */
 	ieee802_1x_new_station(hapd, sta);
 	if (reassoc) {
-		if (sta->auth_alg != WLAN_AUTH_FT)
+		if (sta->auth_alg != WLAN_AUTH_FT &&
+		    !(sta->flags & (WLAN_STA_WPS | WLAN_STA_MAYBE_WPS)))
 			wpa_auth_sm_event(sta->wpa_sm, WPA_REAUTH);
 	} else
 		wpa_auth_sta_associated(hapd->wpa_auth, sta->wpa_sm);
@@ -1554,6 +1555,7 @@ static int setup_interface(struct hostapd_iface *iface)
 		       hapd->iconf->channel, freq);
 
 		if (hostapd_set_freq(hapd, hapd->iconf->hw_mode, freq,
+				     hapd->iconf->ieee80211n,
 				     hapd->iconf->secondary_channel)) {
 			printf("Could not set channel for kernel driver\n");
 			return -1;