2009-10-02 22:02:37 +00:00
|
|
|
--- a/drivers/net/wireless/ath/regd.c
|
|
|
|
+++ b/drivers/net/wireless/ath/regd.c
|
2011-11-18 11:27:19 +00:00
|
|
|
@@ -194,6 +194,10 @@ ath_reg_apply_beaconing_flags(struct wip
|
2010-10-19 21:49:42 +00:00
|
|
|
u32 bandwidth = 0;
|
|
|
|
int r;
|
2009-10-02 22:02:37 +00:00
|
|
|
|
2010-10-19 21:49:42 +00:00
|
|
|
+#ifdef ATH_USER_REGD
|
|
|
|
+ return;
|
2009-10-02 22:02:37 +00:00
|
|
|
+#endif
|
2010-10-19 21:49:42 +00:00
|
|
|
+
|
|
|
|
for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
|
|
|
|
|
|
|
|
if (!wiphy->bands[band])
|
2011-11-18 11:27:19 +00:00
|
|
|
@@ -253,6 +257,10 @@ ath_reg_apply_active_scan_flags(struct w
|
2010-10-19 21:49:42 +00:00
|
|
|
u32 bandwidth = 0;
|
|
|
|
int r;
|
2009-10-02 22:02:37 +00:00
|
|
|
|
|
|
|
+#ifdef ATH_USER_REGD
|
2010-10-19 21:49:42 +00:00
|
|
|
+ return;
|
|
|
|
+#endif
|
2009-10-02 22:02:37 +00:00
|
|
|
+
|
2010-10-19 21:49:42 +00:00
|
|
|
sband = wiphy->bands[IEEE80211_BAND_2GHZ];
|
2011-11-18 11:27:19 +00:00
|
|
|
if (!sband)
|
|
|
|
return;
|
|
|
|
@@ -302,6 +310,10 @@ static void ath_reg_apply_radar_flags(st
|
2010-10-19 21:49:42 +00:00
|
|
|
struct ieee80211_channel *ch;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
+#ifdef ATH_USER_REGD
|
|
|
|
+ return;
|
|
|
|
+#endif
|
2009-10-02 22:02:37 +00:00
|
|
|
+
|
2010-10-19 21:49:42 +00:00
|
|
|
if (!wiphy->bands[IEEE80211_BAND_5GHZ])
|
|
|
|
return;
|
|
|
|
|
2011-11-18 11:27:19 +00:00
|
|
|
@@ -469,6 +481,10 @@ ath_regd_init_wiphy(struct ath_regulator
|
2010-10-19 21:49:42 +00:00
|
|
|
{
|
|
|
|
const struct ieee80211_regdomain *regd;
|
|
|
|
|
|
|
|
+#ifdef ATH_USER_REGD
|
2009-10-02 22:02:37 +00:00
|
|
|
+ return 0;
|
2010-10-19 21:49:42 +00:00
|
|
|
+#endif
|
2009-10-02 22:02:37 +00:00
|
|
|
+
|
2010-10-19 21:49:42 +00:00
|
|
|
wiphy->reg_notifier = reg_notifier;
|
|
|
|
wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;
|
2009-10-02 22:02:37 +00:00
|
|
|
|