forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'wireless-next/master' into mac80211-next

Browse source
This commit is contained in:
Johannes Berg 2013-04-22 15:31:43 +02:00
commit a42c74ee60
519 changed files with 36506 additions and 8320 deletions
Download patch file Download diff file Expand all files Collapse all files

6
net/mac80211/mlme.c
View file

@ -3665,8 +3665,10 @@ void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local)
/* Restart STA timers */
rcu_read_lock();
list_for_each_entry_rcu(sdata, &local->interfaces, list)
ieee80211_restart_sta_timer(sdata);
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
if (ieee80211_sdata_running(sdata))
ieee80211_restart_sta_timer(sdata);
}
rcu_read_unlock();
}