diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-29 21:41:36 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-29 21:41:36 +0100 |
| commit | 9a574cd67a447059f9c14bbef47873315d7f7b35 (patch) | |
| tree | 0ebb71d213d868d8884b1fa0e05b7393c66c665b /net/mac80211/mesh.c | |
| parent | brcmsmac: remove some pmu functions and use the bcma equivalents (diff) | |
| parent | b43: N-PHY: use more bits for offset in RSSI calibration (diff) | |
| download | linux-9a574cd67a447059f9c14bbef47873315d7f7b35.tar.xz linux-9a574cd67a447059f9c14bbef47873315d7f7b35.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/sta_info.c
net/wireless/core.h
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 aead5410c622..123a300cef57 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -1004,7 +1004,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(); } |