diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-14 20:15:43 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-14 20:15:43 +0100 |
| commit | bd2a81307487eba486f200423330d2403d0b893b (patch) | |
| tree | f15102f503619bcbd266acf650ade8b7b17f1c04 /net/mac80211/cfg.c | |
| parent | ath9k: Test for TID only in BlockAcks while checking tx status (diff) | |
| parent | wireless: allow 40 MHz on world roaming channels 12/13 (diff) | |
| download | linux-bd2a81307487eba486f200423330d2403d0b893b.tar.xz linux-bd2a81307487eba486f200423330d2403d0b893b.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
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: |