summary refs log tree commit diff
path: root/net
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-10-31 15:50:34 +0100
committerJohannes Berg <johannes.berg@intel.com>2012-10-31 16:53:34 +0100
commit35f5149ead73e8e635b417b6c3aece43ffdfe5bc (patch)
tree867ed237462ad278c615eff27423a78d39c57205 /net
parent6dbda2d00d466225f9db1dc695ff852443f28832 (diff)
downloadlinux-35f5149ead73e8e635b417b6c3aece43ffdfe5bc.tar.gz
mac80211: do not call ieee80211_configure_filter if no interfaces are up
Drivers are not expected to handle it before drv_start has been called. It
will be called again after an interface has been brought up.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/cfg.c3
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: