diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-07-12 08:19:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-12 08:19:04 +0000 |
| commit | d1af787dc992741bffa1a1ce0b4ca7eacb1f7227 (patch) | |
| tree | b4d150683b180b04da569f049a53d592956d705b /package/mac80211/patches/403-ath_regd_optional.patch | |
| parent | 700de21fec69cc8b11374be00d04660ffbd48943 (diff) | |
| download | upstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.tar.gz upstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.tar.bz2 upstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.zip | |
mac80211: backport latest version from trunk (as of r37265)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37266 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/403-ath_regd_optional.patch')
| -rw-r--r-- | package/mac80211/patches/403-ath_regd_optional.patch | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/package/mac80211/patches/403-ath_regd_optional.patch b/package/mac80211/patches/403-ath_regd_optional.patch index 683417b776..303c4d7792 100644 --- a/package/mac80211/patches/403-ath_regd_optional.patch +++ b/package/mac80211/patches/403-ath_regd_optional.patch @@ -1,46 +1,68 @@ --- a/drivers/net/wireless/ath/regd.c +++ b/drivers/net/wireless/ath/regd.c -@@ -198,6 +198,10 @@ ath_reg_apply_beaconing_flags(struct wip +@@ -196,6 +196,10 @@ ath_reg_apply_beaconing_flags(struct wip struct ieee80211_channel *ch; unsigned int i; -+#ifdef ATH_USER_REGD ++#ifdef CPTCFG_ATH_USER_REGD + return; +#endif + for (band = 0; band < IEEE80211_NUM_BANDS; band++) { if (!wiphy->bands[band]) -@@ -252,6 +256,10 @@ ath_reg_apply_active_scan_flags(struct w +@@ -250,6 +254,10 @@ ath_reg_apply_active_scan_flags(struct w struct ieee80211_channel *ch; const struct ieee80211_reg_rule *reg_rule; -+#ifdef ATH_USER_REGD ++#ifdef CPTCFG_ATH_USER_REGD + return; +#endif + sband = wiphy->bands[IEEE80211_BAND_2GHZ]; if (!sband) return; -@@ -301,6 +309,10 @@ static void ath_reg_apply_radar_flags(st +@@ -299,6 +307,10 @@ static void ath_reg_apply_radar_flags(st struct ieee80211_channel *ch; unsigned int i; -+#ifdef ATH_USER_REGD ++#ifdef CPTCFG_ATH_USER_REGD + return; +#endif + if (!wiphy->bands[IEEE80211_BAND_5GHZ]) return; -@@ -505,6 +517,10 @@ ath_regd_init_wiphy(struct ath_regulator +@@ -503,6 +515,10 @@ ath_regd_init_wiphy(struct ath_regulator { const struct ieee80211_regdomain *regd; -+#ifdef ATH_USER_REGD ++#ifdef CPTCFG_ATH_USER_REGD + return 0; +#endif + wiphy->reg_notifier = reg_notifier; wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY; +--- a/drivers/net/wireless/ath/Kconfig ++++ b/drivers/net/wireless/ath/Kconfig +@@ -21,6 +21,9 @@ menuconfig ATH_CARDS + + if ATH_CARDS + ++config ATH_USER_REGD ++ bool "Do not enforce EEPROM regulatory restrictions" ++ + config ATH_DEBUG + bool "Atheros wireless debugging" + ---help--- +--- a/.local-symbols ++++ b/.local-symbols +@@ -123,6 +123,7 @@ RTL8187_LEDS= + ATH_COMMON= + ATH_CARDS= + ATH_DEBUG= ++ATH_USER_REGD= + ATH5K= + ATH5K_DEBUG= + ATH5K_TRACER= |