diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-11 07:53:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-11 07:53:41 +0200 |
| commit | de02d72bb3cc5b3d4c873db4ca8291723dd48479 (patch) | |
| tree | c937017bdc271d23ef75c4e0214d45e59227b2d9 /net/mac80211 | |
| parent | net: Fix FDDI and TR config checks in ipv4 arp and LLC. (diff) | |
| parent | mac80211: remove association work when processing deauth request (diff) | |
| download | linux-de02d72bb3cc5b3d4c873db4ca8291723dd48479.tar.xz linux-de02d72bb3cc5b3d4c873db4ca8291723dd48479.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211')
| -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 4aefa6dc3091..875c8dec940a 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2030,7 +2030,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)) |