|
@@ -1052,7 +1052,7 @@ static u32 map_regdom_flags(u32 rd_flags)
|
|
|
}
|
|
|
|
|
|
static const struct ieee80211_reg_rule *
|
|
|
-freq_reg_info_regd(struct wiphy *wiphy, u32 center_freq,
|
|
|
+freq_reg_info_regd(u32 center_freq,
|
|
|
const struct ieee80211_regdomain *regd, u32 bw)
|
|
|
{
|
|
|
int i;
|
|
@@ -1097,7 +1097,7 @@ __freq_reg_info(struct wiphy *wiphy, u32 center_freq, u32 min_bw)
|
|
|
u32 bw;
|
|
|
|
|
|
for (bw = MHZ_TO_KHZ(20); bw >= min_bw; bw = bw / 2) {
|
|
|
- reg_rule = freq_reg_info_regd(wiphy, center_freq, regd, bw);
|
|
|
+ reg_rule = freq_reg_info_regd(center_freq, regd, bw);
|
|
|
if (!IS_ERR(reg_rule))
|
|
|
return reg_rule;
|
|
|
}
|
|
@@ -1765,8 +1765,7 @@ static void handle_channel_custom(struct wiphy *wiphy,
|
|
|
u32 bw;
|
|
|
|
|
|
for (bw = MHZ_TO_KHZ(20); bw >= MHZ_TO_KHZ(5); bw = bw / 2) {
|
|
|
- reg_rule = freq_reg_info_regd(wiphy,
|
|
|
- MHZ_TO_KHZ(chan->center_freq),
|
|
|
+ reg_rule = freq_reg_info_regd(MHZ_TO_KHZ(chan->center_freq),
|
|
|
regd, bw);
|
|
|
if (!IS_ERR(reg_rule))
|
|
|
break;
|