diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-04-28 12:37:09 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-04-28 12:37:09 +0000 |
commit | d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b (patch) | |
tree | 55111555c00d21d4857262bd9ca3ee0bc2bcf222 /package/mac80211/patches/403-ath_regd_optional.patch | |
parent | acd03cf8d8c3a047108b7983944b0c8d0228f812 (diff) | |
download | upstream-d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b.tar.gz upstream-d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b.tar.bz2 upstream-d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b.zip |
mac80211: update to 2013-02-22 from trunk + backports
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36470 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 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/mac80211/patches/403-ath_regd_optional.patch b/package/mac80211/patches/403-ath_regd_optional.patch index 1854c271e5..683417b776 100644 --- a/package/mac80211/patches/403-ath_regd_optional.patch +++ b/package/mac80211/patches/403-ath_regd_optional.patch @@ -1,8 +1,8 @@ --- a/drivers/net/wireless/ath/regd.c +++ b/drivers/net/wireless/ath/regd.c -@@ -200,6 +200,10 @@ ath_reg_apply_beaconing_flags(struct wip - u32 bandwidth = 0; - int r; +@@ -198,6 +198,10 @@ ath_reg_apply_beaconing_flags(struct wip + struct ieee80211_channel *ch; + unsigned int i; +#ifdef ATH_USER_REGD + return; @@ -11,9 +11,9 @@ for (band = 0; band < IEEE80211_NUM_BANDS; band++) { if (!wiphy->bands[band]) -@@ -259,6 +263,10 @@ ath_reg_apply_active_scan_flags(struct w - u32 bandwidth = 0; - int r; +@@ -252,6 +256,10 @@ ath_reg_apply_active_scan_flags(struct w + struct ieee80211_channel *ch; + const struct ieee80211_reg_rule *reg_rule; +#ifdef ATH_USER_REGD + return; @@ -22,7 +22,7 @@ sband = wiphy->bands[IEEE80211_BAND_2GHZ]; if (!sband) return; -@@ -308,6 +316,10 @@ static void ath_reg_apply_radar_flags(st +@@ -301,6 +309,10 @@ static void ath_reg_apply_radar_flags(st struct ieee80211_channel *ch; unsigned int i; @@ -33,7 +33,7 @@ if (!wiphy->bands[IEEE80211_BAND_5GHZ]) return; -@@ -514,6 +526,10 @@ ath_regd_init_wiphy(struct ath_regulator +@@ -505,6 +517,10 @@ ath_regd_init_wiphy(struct ath_regulator { const struct ieee80211_regdomain *regd; |