lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'wireless-2.6' into wireless-next-2.6

Browse Source 
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-dev.h
This commit is contained in:
Reinette Chatre
2010-05-10 15:08:11 -07:00
parent 9459d59fbf 562db53276
commit a15707d80e
5 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/mac80211/mlme.c
View File

@@ -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))