diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-04-16 21:08:41 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-04-16 21:08:41 +0000 |
| commit | e4f208ebf3029f415cf0a79d41ea27fa45c2a62c (patch) | |
| tree | f3d4a3ace1fce602fa8b9fb1e3c84e817c712d49 /package/mac80211/patches/403-ath_regd_optional.patch | |
| parent | c47c2671d413055a8753f2aec429a8d072c5ed9a (diff) | |
| download | master-187ad058-e4f208ebf3029f415cf0a79d41ea27fa45c2a62c.tar.gz master-187ad058-e4f208ebf3029f415cf0a79d41ea27fa45c2a62c.tar.bz2 master-187ad058-e4f208ebf3029f415cf0a79d41ea27fa45c2a62c.zip | |
mac80211: update to wireless-testing 2012-04-13
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31322 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 | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/package/mac80211/patches/403-ath_regd_optional.patch b/package/mac80211/patches/403-ath_regd_optional.patch new file mode 100644 index 0000000000..21cb519f13 --- /dev/null +++ b/package/mac80211/patches/403-ath_regd_optional.patch @@ -0,0 +1,46 @@ +--- a/drivers/net/wireless/ath/regd.c ++++ b/drivers/net/wireless/ath/regd.c +@@ -199,6 +199,10 @@ ath_reg_apply_beaconing_flags(struct wip + u32 bandwidth = 0; + int r; + ++#ifdef ATH_USER_REGD ++ return; ++#endif ++ + for (band = 0; band < IEEE80211_NUM_BANDS; band++) { + + if (!wiphy->bands[band]) +@@ -258,6 +262,10 @@ ath_reg_apply_active_scan_flags(struct w + u32 bandwidth = 0; + int r; + ++#ifdef ATH_USER_REGD ++ return; ++#endif ++ + sband = wiphy->bands[IEEE80211_BAND_2GHZ]; + if (!sband) + return; +@@ -307,6 +315,10 @@ static void ath_reg_apply_radar_flags(st + struct ieee80211_channel *ch; + unsigned int i; + ++#ifdef ATH_USER_REGD ++ return; ++#endif ++ + if (!wiphy->bands[IEEE80211_BAND_5GHZ]) + return; + +@@ -513,6 +525,10 @@ ath_regd_init_wiphy(struct ath_regulator + { + const struct ieee80211_regdomain *regd; + ++#ifdef ATH_USER_REGD ++ return 0; ++#endif ++ + wiphy->reg_notifier = reg_notifier; + wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY; + |