diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-31 14:59:27 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-31 14:59:27 +0000 |
| commit | 2faf4dbc80618425ad130d1d5710e285196da03b (patch) | |
| tree | 348f1d589220bddc5afdb74060d5b7fef7722223 | |
| parent | 1802137ccbb542b6dcf4221c76f277821a8374c3 (diff) | |
| download | openwrt-2faf4dbc80618425ad130d1d5710e285196da03b.tar.gz openwrt-2faf4dbc80618425ad130d1d5710e285196da03b.zip | |
mac80211: prevent reconfigure calls while interfaces are down
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r34030
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34031 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 12 | ||||
| -rw-r--r-- | package/mac80211/patches/524-mac80211_configure_antenna_gain.patch | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index 56f5af959..577a8494c 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 b3b4ebb2f..99bdb84ff 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, |