diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-28 19:40:06 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-28 19:40:06 +0100 |
| commit | 630a216da662ba4197e330118fc55d772a2d7ec9 (patch) | |
| tree | ddadafda9ba834e74e7f882d761900e08bb1ca1c /net/mac80211/mesh.c | |
| parent | aoe: reserve enough headroom on skbs (diff) | |
| parent | b43: N-PHY: use more bits for offset in RSSI calibration (diff) | |
| download | linux-630a216da662ba4197e330118fc55d772a2d7ec9.tar.xz linux-630a216da662ba4197e330118fc55d772a2d7ec9.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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 29ce2aa87e7b..4749b3858695 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(); } |