summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-11-12 14:37:29 -0800
committerDavid S. Miller <davem@davemloft.net>2008-11-12 14:37:29 -0800
commitddd535c713c788f3c23c6548c4ba985a7593113c (patch)
treebb7ed2fc52c1e99803c47e4c2134ced01161f1f2 /net
parente23a59e1ca6d177a57a7791b3629db93ff1d9813 (diff)
parentf7cd168645dda3e9067f24fabbfa787f9a237488 (diff)
downloadop-kernel-dev-ddd535c713c788f3c23c6548c4ba985a7593113c.zip
op-kernel-dev-ddd535c713c788f3c23c6548c4ba985a7593113c.tar.gz
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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 87665d7b..14d165f 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2570,14 +2570,14 @@ void ieee80211_notify_mac(struct ieee80211_hw *hw,
switch (notif_type) {
case IEEE80211_NOTIFY_RE_ASSOC:
- rcu_read_lock();
- list_for_each_entry_rcu(sdata, &local->interfaces, list) {
+ rtnl_lock();
+ list_for_each_entry(sdata, &local->interfaces, list) {
if (sdata->vif.type != NL80211_IFTYPE_STATION)
continue;
ieee80211_sta_req_auth(sdata, &sdata->u.sta);
}
- rcu_read_unlock();
+ rtnl_unlock();
break;
}
}
OpenPOWER on IntegriCloud