From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 31 Oct 2012 14:59:12 +0000 (+0000)
Subject: mac80211: prevent reconfigure calls while interfaces are down
X-Git-Tag: reboot~12434
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=661d1efc8029408c0a1f09faa15339f95a6561d6;p=openwrt%2Fstaging%2Fnoltari.git

mac80211: prevent reconfigure calls while interfaces are down

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 34030
---

diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 56f5af959b..577a8494c6 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -774,3 +774,15 @@
  		txok = false;
  
  	isaggr = bf_isaggr(bf);
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -2563,6 +2563,9 @@ static void ieee80211_mgmt_frame_registe
+ 		else
+ 			local->probe_req_reg--;
+ 
++		if (!local->open_count)
++			break;
++
+ 		ieee80211_queue_work(&local->hw, &local->reconfig_filter);
+ 		break;
+ 	default:
diff --git a/package/mac80211/patches/524-mac80211_configure_antenna_gain.patch b/package/mac80211/patches/524-mac80211_configure_antenna_gain.patch
index b3b4ebb2f3..99bdb84ff7 100644
--- a/package/mac80211/patches/524-mac80211_configure_antenna_gain.patch
+++ b/package/mac80211/patches/524-mac80211_configure_antenna_gain.patch
@@ -151,7 +151,7 @@
  static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
  				  const u8 *addr)
  {
-@@ -3082,6 +3095,7 @@ struct cfg80211_ops mac80211_config_ops 
+@@ -3085,6 +3098,7 @@ struct cfg80211_ops mac80211_config_ops 
  	.set_wiphy_params = ieee80211_set_wiphy_params,
  	.set_tx_power = ieee80211_set_tx_power,
  	.get_tx_power = ieee80211_get_tx_power,