You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
955 B
46 lines
955 B
--- a/drivers/net/wireless/ath/regd.c
|
|
+++ b/drivers/net/wireless/ath/regd.c
|
|
@@ -196,6 +196,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])
|
|
@@ -255,6 +259,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;
|
|
@@ -304,6 +312,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;
|
|
|
|
@@ -510,6 +522,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;
|
|
|
|
|