diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-14 23:06:44 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-14 23:06:44 -0800 |
| commit | ac178ef0ae9eb44fd527d87aa9b6394e05f56e1f (patch) | |
| tree | 5d6bd46ecf9ce989134d3c460e1ecf5dd1fceadc /net/mac80211/iface.c | |
| parent | f3a7c66b5ce0b75a9774a50b5dcce93e5ba28370 (diff) | |
| parent | 6d08b9b9c6eb2414c4a037407dd121298a74fb36 (diff) | |
| download | kernel-crypto-ac178ef0ae9eb44fd527d87aa9b6394e05f56e1f.tar.gz kernel-crypto-ac178ef0ae9eb44fd527d87aa9b6394e05f56e1f.tar.xz kernel-crypto-ac178ef0ae9eb44fd527d87aa9b6394e05f56e1f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 915d04323a3..df94b936526 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -362,8 +362,7 @@ static int ieee80211_stop(struct net_device *dev) list_for_each_entry_rcu(sta, &local->sta_list, list) { if (sta->sdata == sdata) - ieee80211_sta_tear_down_BA_sessions(sdata, - sta->sta.addr); + ieee80211_sta_tear_down_BA_sessions(sta); } rcu_read_unlock(); @@ -523,7 +522,7 @@ static int ieee80211_stop(struct net_device *dev) * scan event to userspace -- the scan is incomplete. */ if (local->sw_scanning) - ieee80211_scan_completed(&local->hw); + ieee80211_scan_completed(&local->hw, true); } conf.vif = &sdata->vif; |