diff options
author | David S. Miller <davem@davemloft.net> | 2010-12-15 09:43:13 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-15 09:43:13 -0800 |
commit | 82cc4f5cb8be6dede34c32a814ab1470409e1840 (patch) | |
tree | 1ab46942502a2841479c8a614d5bca8a7901227a /net/mac80211/ibss.c | |
parent | 2a27a03d3a891e87ca33d27a858b4db734a4cbab (diff) | |
parent | 56e6417b49132d4f56e9f2241d31942b90b46315 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/ibss.c')
-rw-r--r-- | net/mac80211/ibss.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 239c4836a946..077a93dd1671 100644 --- a/net/mac80211/ibss.c +++ b/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); } |