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/mesh.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/mesh.c')
-rw-r--r-- | net/mac80211/mesh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 29ce2aa87e7..4749b385869 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -1060,7 +1060,8 @@ void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local) rcu_read_lock(); list_for_each_entry_rcu(sdata, &local->interfaces, list) - if (ieee80211_vif_is_mesh(&sdata->vif)) + if (ieee80211_vif_is_mesh(&sdata->vif) && + ieee80211_sdata_running(sdata)) ieee80211_queue_work(&local->hw, &sdata->work); rcu_read_unlock(); } |