diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-25 14:50:17 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-25 14:50:17 -0400 |
| commit | fae172136c0cfc80cb4b13620c861688e671650a (patch) | |
| tree | 3dc683dcd8beb5e61361fadd74736742fd35c70b /net/mac80211/mlme.c | |
| parent | 36ef0b473fbf43d5db23eea4616cc1d18cec245f (diff) | |
| parent | 370bd005937c0e00f9104a602f9fe1dd6b21b54b (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 141577412d8..82cc30318a8 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -3608,8 +3608,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(); } |