diff options
| author | Reinette Chatre <reinette.chatre@intel.com> | 2010-05-11 00:08:11 +0200 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-05-11 00:08:11 +0200 |
| commit | a15707d80ee9a0e0812c5f1a1ed8e41e0a6e52f3 (patch) | |
| tree | b1774dad1d72b70d88ab6c51ff4b87697dfca57a /net | |
| parent | wireless: depends on NET (diff) | |
| parent | iwlagn: wait for asynchronous firmware loading (diff) | |
| download | linux-a15707d80ee9a0e0812c5f1a1ed8e41e0a6e52f3.tar.xz linux-a15707d80ee9a0e0812c5f1a1ed8e41e0a6e52f3.zip | |
Merge branch 'wireless-2.6' into wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-dev.h
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/mlme.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 6e149b49d4f0..7bfb0ebaaf00 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2177,7 +2177,8 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata, continue; if (wk->type != IEEE80211_WORK_DIRECT_PROBE && - wk->type != IEEE80211_WORK_AUTH) + wk->type != IEEE80211_WORK_AUTH && + wk->type != IEEE80211_WORK_ASSOC) continue; if (memcmp(req->bss->bssid, wk->filter_ta, ETH_ALEN)) |