diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-11 01:53:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-11 01:53:41 -0400 |
| commit | de02d72bb3cc5b3d4c873db4ca8291723dd48479 (patch) | |
| tree | c937017bdc271d23ef75c4e0214d45e59227b2d9 /net | |
| parent | f0ecde1466f21edf577b809735f4f35f354777a0 (diff) | |
| parent | 79733a865c7fd778ce45e3503962b3a875b0a153 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
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 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, | |||
| 2030 | continue; | 2030 | continue; |
| 2031 | 2031 | ||
| 2032 | if (wk->type != IEEE80211_WORK_DIRECT_PROBE && | 2032 | if (wk->type != IEEE80211_WORK_DIRECT_PROBE && |
| 2033 | wk->type != IEEE80211_WORK_AUTH) | 2033 | wk->type != IEEE80211_WORK_AUTH && |
| 2034 | wk->type != IEEE80211_WORK_ASSOC) | ||
| 2034 | continue; | 2035 | continue; |
| 2035 | 2036 | ||
| 2036 | if (memcmp(req->bss->bssid, wk->filter_ta, ETH_ALEN)) | 2037 | if (memcmp(req->bss->bssid, wk->filter_ta, ETH_ALEN)) |