diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-01-30 13:21:36 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-01-30 13:21:36 +0000 |
| commit | eb7a1ba94b7221358ab5f207d8af8dc8b7a2cf74 (patch) | |
| tree | f384015bf67b4da2efefd6d04a7f620dfe4504b1 /package/kernel/mac80211/patches/404-world_regd_fixup.patch | |
| parent | 2725913d2acca4774c41c7de0d8f4940615a3f1d (diff) | |
| download | upstream-eb7a1ba94b7221358ab5f207d8af8dc8b7a2cf74.tar.gz upstream-eb7a1ba94b7221358ab5f207d8af8dc8b7a2cf74.tar.bz2 upstream-eb7a1ba94b7221358ab5f207d8af8dc8b7a2cf74.zip | |
mac80211: update to wireless-testing 2014-01-23
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 39427
Diffstat (limited to 'package/kernel/mac80211/patches/404-world_regd_fixup.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/404-world_regd_fixup.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/kernel/mac80211/patches/404-world_regd_fixup.patch b/package/kernel/mac80211/patches/404-world_regd_fixup.patch index a0f4d1f52a..2b04309ce5 100644 --- a/package/kernel/mac80211/patches/404-world_regd_fixup.patch +++ b/package/kernel/mac80211/patches/404-world_regd_fixup.patch @@ -1,16 +1,16 @@ --- a/drivers/net/wireless/ath/regd.c +++ b/drivers/net/wireless/ath/regd.c -@@ -42,7 +42,8 @@ static int __ath_regd_init(struct ath_re - NL80211_RRF_NO_IR | NL80211_RRF_NO_OFDM) +@@ -43,7 +43,8 @@ static int __ath_regd_init(struct ath_re + NL80211_RRF_NO_OFDM) /* We allow IBSS on these on a case by case basis by regulatory domain */ -#define ATH9K_5GHZ_5150_5350 REG_RULE(5150-10, 5350+10, 80, 0, 30,\ +#define ATH9K_5GHZ_5150_5350 REG_RULE(5150-10, 5240+10, 80, 0, 30, 0),\ + REG_RULE(5260-10, 5350+10, 80, 0, 30,\ - NL80211_RRF_NO_IR) + NL80211_RRF_NO_IR) #define ATH9K_5GHZ_5470_5850 REG_RULE(5470-10, 5850+10, 80, 0, 30,\ - NL80211_RRF_NO_IR) -@@ -60,57 +61,56 @@ static int __ath_regd_init(struct ath_re + NL80211_RRF_NO_IR) +@@ -61,57 +62,56 @@ static int __ath_regd_init(struct ath_re #define ATH9K_5GHZ_NO_MIDBAND ATH9K_5GHZ_5150_5350, \ ATH9K_5GHZ_5725_5850 @@ -81,4 +81,4 @@ + ) }; - static inline bool is_wwr_sku(u16 regd) + static bool dynamic_country_user_possible(struct ath_regulatory *reg) |