diff options
| author | Reinette Chatre <reinette.chatre@intel.com> | 2010-05-10 18:08:11 -0400 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-05-10 18:08:11 -0400 |
| commit | a15707d80ee9a0e0812c5f1a1ed8e41e0a6e52f3 (patch) | |
| tree | b1774dad1d72b70d88ab6c51ff4b87697dfca57a /net | |
| parent | 9459d59fbf0bc82ff4c804679fa8bc22788eca63 (diff) | |
| parent | 562db532760827f6ce30801a08e6b568848bc9f2 (diff) | |
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, | |||
| 2177 | continue; | 2177 | continue; |
| 2178 | 2178 | ||
| 2179 | if (wk->type != IEEE80211_WORK_DIRECT_PROBE && | 2179 | if (wk->type != IEEE80211_WORK_DIRECT_PROBE && |
| 2180 | wk->type != IEEE80211_WORK_AUTH) | 2180 | wk->type != IEEE80211_WORK_AUTH && |
| 2181 | wk->type != IEEE80211_WORK_ASSOC) | ||
| 2181 | continue; | 2182 | continue; |
| 2182 | 2183 | ||
| 2183 | if (memcmp(req->bss->bssid, wk->filter_ta, ETH_ALEN)) | 2184 | if (memcmp(req->bss->bssid, wk->filter_ta, ETH_ALEN)) |