diff --git a/[refs] b/[refs]
index c076df84c2a5..409d45ed20fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e60c7744f8aa77bcbcb0b294596d6c87445d1200
+refs/heads/master: cb3da8ccc464409e3b947557cdac4cd0b1241c4c
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 806d3ded98bd..87b2ac85d911 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2012,7 +2012,7 @@ static int ieee80211_sta_match_ssid(struct ieee80211_if_sta *ifsta,
 		}
 	}
 
-	if (hidden_ssid && ifsta->ssid_len == ssid_len)
+	if (hidden_ssid && (ifsta->ssid_len == ssid_len || ssid_len == 0))
 		return 1;
 
 	if (ssid_len == 1 && ssid[0] == ' ')