diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-16 12:59:13 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-16 12:59:13 -0500 |
| commit | 26c6e80892d8c160dffaba85889bd4e65b1dacf6 (patch) | |
| tree | 0d7751d80ac44b9407270be246f83e8354fc26ba /net/mac80211/cfg.c | |
| parent | 6fc4adca6ce3e1d57a42707019dddcb883578a91 (diff) | |
| parent | d61f978b8f26d2392c88249f877e46e2c2b5561d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 05f3a313db8..7371f676cf4 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -2594,6 +2594,9 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy, else local->probe_req_reg--; + if (!local->open_count) + break; + ieee80211_queue_work(&local->hw, &local->reconfig_filter); break; default: |