diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
| commit | 278554bd6579206921f5d8a523649a7a57f8850d (patch) | |
| tree | 4e6c527daf0910e455b3aa72e2c96b0479e430be /net/mac80211/mlme.c | |
| parent | 5a147e8bf982f9dd414c1dd751fe02c1942506b2 (diff) | |
| parent | cea0d767c29669bf89f86e4aee46ef462d2ebae8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c
Diffstat (limited to 'net/mac80211/mlme.c')
| -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 11783192a625..3093e46273c3 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
| @@ -2178,7 +2178,8 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata, | |||
| 2178 | continue; | 2178 | continue; |
| 2179 | 2179 | ||
| 2180 | if (wk->type != IEEE80211_WORK_DIRECT_PROBE && | 2180 | if (wk->type != IEEE80211_WORK_DIRECT_PROBE && |
| 2181 | wk->type != IEEE80211_WORK_AUTH) | 2181 | wk->type != IEEE80211_WORK_AUTH && |
| 2182 | wk->type != IEEE80211_WORK_ASSOC) | ||
| 2182 | continue; | 2183 | continue; |
| 2183 | 2184 | ||
| 2184 | if (memcmp(req->bss->bssid, wk->filter_ta, ETH_ALEN)) | 2185 | if (memcmp(req->bss->bssid, wk->filter_ta, ETH_ALEN)) |