Re: Association broken with wpa_supplicant

["John W. Linville" <linville@tuxdriver.com>]

On Fri, May 16, 2008 at 12:30:10AM +0200, Michael Buesch wrote:
> Hi John,
> 
> Association is broken in latest wireless-testing when using
> wpa_supplicant. It tells me
> 
> Trying to associate with REAL_BSSID...
> Authentication with 00:00:00:00:00:00 timed out.
> 
> The commit responsible for the breakage is
> 
> Author: Abhijeet Kolekar <abhijeet.kolekar@intel.com>  2008-05-09 18:35:41
> Committer: John W. Linville <linville@tuxdriver.com>  2008-05-15 22:11:19
> Parent: 6d7ef8714c227884346aebd9f4e5eea302db6d22 (hostap: fix "registers" registration in procfs)
> Child:  d67ec7fb2b8ce69709def2421ab893517b101591 (libertas: fix command timeout after firmware failure)
> Branches: master, remotes/origin/master
> Follows: master-2008-05-14
> Precedes: master-2008-05-15
> 
>     mac80211 : Association with 11n hidden ssid ap.

Instead of reverting it, could you try applying this one on top of it?

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 508f675..76ad4ed 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3440,8 +3440,11 @@ static int ieee80211_sta_config_auth(struct net_device *dev,
 		if (!(bss->capability & WLAN_CAPABILITY_ESS))
 			continue;
 
-		if (!!(bss->capability & WLAN_CAPABILITY_PRIVACY) ^
-		    !!sdata->default_key)
+		if ((ifsta->flags & (IEEE80211_STA_AUTO_SSID_SEL |
+			IEEE80211_STA_AUTO_BSSID_SEL |
+			IEEE80211_STA_AUTO_CHANNEL_SEL)) &&
+		    (!!(bss->capability & WLAN_CAPABILITY_PRIVACY) ^
+		     !!sdata->default_key))
 			continue;
 
 		if (!(ifsta->flags & IEEE80211_STA_AUTO_CHANNEL_SEL) &&
-- 
John W. Linville
linville@tuxdriver.com