mac80211: prevent reconfigure calls while interfaces are down
authorFelix Fietkau <nbd@openwrt.org>
Wed, 31 Oct 2012 14:59:27 +0000 (14:59 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Wed, 31 Oct 2012 14:59:27 +0000 (14:59 +0000)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r34030

SVN-Revision: 34031

package/mac80211/patches/300-pending_work.patch
package/mac80211/patches/524-mac80211_configure_antenna_gain.patch

index 56f5af9..577a849 100644 (file)
                txok = false;
  
        isaggr = bf_isaggr(bf);
                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:
index b3b4ebb..99bdb84 100644 (file)
  static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
                                  const u8 *addr)
  {
  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,
        .set_wiphy_params = ieee80211_set_wiphy_params,
        .set_tx_power = ieee80211_set_tx_power,
        .get_tx_power = ieee80211_get_tx_power,