diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-12-15 21:33:28 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-15 21:33:28 (GMT) |
commit | 1fcfe76a760e78d7774a254608557c84071b0cfb (patch) | |
tree | 2659028625a15a6bcbef350d16ace21982f714d4 /net/mac80211/ibss.c | |
parent | 0c8173385e549f95cd80c3fff5aab87b4f881d8d (diff) | |
parent | 56e6417b49132d4f56e9f2241d31942b90b46315 (diff) | |
download | linux-fsl-qoriq-1fcfe76a760e78d7774a254608557c84071b0cfb.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
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 410d104..53c7077 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); } |