From ebfec2faf50d58beceb64a1094e4cde36e7678ee Mon Sep 17 00:00:00 2001
From: Tim Harvey <harvey.tim@gmail.com>
Date: Thu, 9 Dec 2010 10:43:13 -0800
Subject: [PATCH] --- yaml --- r: 223617 b: refs/heads/master c:
 c926d006c1514cfb3572893f41f2324e96823661 h: refs/heads/master i:   223615:
 9ad19a9daaafe95740817284479c083db44f7999 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/ibss.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6720993a645e..8a0bcd43edda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a55d5852adbe66722fb1636c82c7864cd5be441
+refs/heads/master: c926d006c1514cfb3572893f41f2324e96823661
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
index 239c4836a946..077a93dd1671 100644
--- a/trunk/net/mac80211/ibss.c
+++ b/trunk/net/mac80211/ibss.c
@@ -780,6 +780,9 @@ void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
 
 	mutex_lock(&sdata->u.ibss.mtx);
 
+	if (!sdata->u.ibss.ssid_len)
+		goto mgmt_out; /* not ready to merge yet */
+
 	switch (fc & IEEE80211_FCTL_STYPE) {
 	case IEEE80211_STYPE_PROBE_REQ:
 		ieee80211_rx_mgmt_probe_req(sdata, mgmt, skb->len);
@@ -797,6 +800,7 @@ void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
 		break;
 	}
 
+ mgmt_out:
 	mutex_unlock(&sdata->u.ibss.mtx);
 }