diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-04-26 10:52:03 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-04-26 10:52:03 +0000 |
commit | 26bf4e16d894d427a6b88a15a837f23604f52ad0 (patch) | |
tree | 2b493d850864a30c924d148f67413ab20407b8ef /package/mac80211/patches/701-mwl8k-don-t-overwrite-regulatory-settings.patch | |
parent | 37a71bba1d478ed29a38dfd766717c3f643ef4c7 (diff) | |
download | master-187ad058-26bf4e16d894d427a6b88a15a837f23604f52ad0.tar.gz master-187ad058-26bf4e16d894d427a6b88a15a837f23604f52ad0.tar.bz2 master-187ad058-26bf4e16d894d427a6b88a15a837f23604f52ad0.zip |
mac80211: update to wireless-testing 2013-04-16 + backports
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36448 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/701-mwl8k-don-t-overwrite-regulatory-settings.patch')
-rw-r--r-- | package/mac80211/patches/701-mwl8k-don-t-overwrite-regulatory-settings.patch | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/package/mac80211/patches/701-mwl8k-don-t-overwrite-regulatory-settings.patch b/package/mac80211/patches/701-mwl8k-don-t-overwrite-regulatory-settings.patch deleted file mode 100644 index 890debc47f..0000000000 --- a/package/mac80211/patches/701-mwl8k-don-t-overwrite-regulatory-settings.patch +++ /dev/null @@ -1,70 +0,0 @@ -From f340b99171e923eb6b54c1d0c22c15b45df40647 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski <jogo@openwrt.org> -Date: Mon, 11 Mar 2013 17:17:28 +0100 -Subject: [PATCH] mwl8k: don't overwrite regulatory settings - -Currently the caps are parsed on every firmware reload, causing any -channel flags to be cleared. -When there is a firmware to interface mode mismatch, the triggered -firmware reload causes a reset of the regulatory settings, causing all -channels to become available: - -root@openrouter:/# iw phy phy0 info -Wiphy phy0 - Band 1: - (...) - Frequencies: - * 2412 MHz [1] (0.0 dBm) - * 2417 MHz [2] (0.0 dBm) - * 2422 MHz [3] (0.0 dBm) - * 2427 MHz [4] (0.0 dBm) - * 2432 MHz [5] (0.0 dBm) - * 2437 MHz [6] (0.0 dBm) - * 2442 MHz [7] (0.0 dBm) - * 2447 MHz [8] (0.0 dBm) - * 2452 MHz [9] (0.0 dBm) - * 2457 MHz [10] (0.0 dBm) - * 2462 MHz [11] (0.0 dBm) - * 2467 MHz [12] (0.0 dBm) - * 2472 MHz [13] (0.0 dBm) - * 2484 MHz [14] (0.0 dBm) - (...) - -To prevent this, only parse the caps on the first firmware load during -hardware probe, and store them locally to know we have already parsed -them. - -Signed-off-by: Jonas Gorski <jogo@openwrt.org> ---- - drivers/net/wireless/mwl8k.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/drivers/net/wireless/mwl8k.c -+++ b/drivers/net/wireless/mwl8k.c -@@ -232,6 +232,7 @@ struct mwl8k_priv { - u16 num_mcaddrs; - u8 hw_rev; - u32 fw_rev; -+ u32 caps; - - /* - * Running count of TX packets in flight, to avoid -@@ -2401,6 +2402,9 @@ mwl8k_set_caps(struct ieee80211_hw *hw, - { - struct mwl8k_priv *priv = hw->priv; - -+ if (priv->caps) -+ return; -+ - if ((caps & MWL8K_CAP_2GHZ4) || !(caps & MWL8K_CAP_BAND_MASK)) { - mwl8k_setup_2ghz_band(hw); - if (caps & MWL8K_CAP_MIMO) -@@ -2412,6 +2416,8 @@ mwl8k_set_caps(struct ieee80211_hw *hw, - if (caps & MWL8K_CAP_MIMO) - mwl8k_set_ht_caps(hw, &priv->band_50, caps); - } -+ -+ priv->caps = caps; - } - - static int mwl8k_cmd_get_hw_spec_sta(struct ieee80211_hw *hw) |