diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-17 06:26:00 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-17 06:26:00 +0400 |
| commit | 1e619a1bf9ac878e6a984e4e279ccf712a65bc23 (patch) | |
| tree | 1d5cfb16f88e36dca2f57386dd4a585a63f15287 /net/mac80211/cfg.c | |
| parent | 68a81291ff6650f3ff409ebfc58ef97dfe85a2e4 (diff) | |
| parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
| download | linux-1e619a1bf9ac878e6a984e4e279ccf712a65bc23.tar.xz | |
Merge 3.7-rc6 into tty-next
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 05f3a313db88..7371f676cf41 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: |