mac80211: update to 2011-08-10
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 404-ath_regd_optional.patch
1 --- a/drivers/net/wireless/ath/regd.c
2 +++ b/drivers/net/wireless/ath/regd.c
3 @@ -193,6 +193,10 @@ ath_reg_apply_beaconing_flags(struct wip
4 u32 bandwidth = 0;
5 int r;
6
7 +#ifdef ATH_USER_REGD
8 + return;
9 +#endif
10 +
11 for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
12
13 if (!wiphy->bands[band])
14 @@ -252,6 +256,10 @@ ath_reg_apply_active_scan_flags(struct w
15 u32 bandwidth = 0;
16 int r;
17
18 +#ifdef ATH_USER_REGD
19 + return;
20 +#endif
21 +
22 sband = wiphy->bands[IEEE80211_BAND_2GHZ];
23
24 /*
25 @@ -299,6 +307,10 @@ static void ath_reg_apply_radar_flags(st
26 struct ieee80211_channel *ch;
27 unsigned int i;
28
29 +#ifdef ATH_USER_REGD
30 + return;
31 +#endif
32 +
33 if (!wiphy->bands[IEEE80211_BAND_5GHZ])
34 return;
35
36 @@ -466,6 +478,10 @@ ath_regd_init_wiphy(struct ath_regulator
37 {
38 const struct ieee80211_regdomain *regd;
39
40 +#ifdef ATH_USER_REGD
41 + return 0;
42 +#endif
43 +
44 wiphy->reg_notifier = reg_notifier;
45 wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;
46