|
@@ -2745,7 +2745,7 @@ static void print_rd_rules(const struct ieee80211_regdomain *rd)
|
|
const struct ieee80211_power_rule *power_rule = NULL;
|
|
const struct ieee80211_power_rule *power_rule = NULL;
|
|
char bw[32], cac_time[32];
|
|
char bw[32], cac_time[32];
|
|
|
|
|
|
- pr_info(" (start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp), (dfs_cac_time)\n");
|
|
|
|
|
|
+ pr_debug(" (start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp), (dfs_cac_time)\n");
|
|
|
|
|
|
for (i = 0; i < rd->n_reg_rules; i++) {
|
|
for (i = 0; i < rd->n_reg_rules; i++) {
|
|
reg_rule = &rd->reg_rules[i];
|
|
reg_rule = &rd->reg_rules[i];
|
|
@@ -2772,7 +2772,7 @@ static void print_rd_rules(const struct ieee80211_regdomain *rd)
|
|
* in certain regions
|
|
* in certain regions
|
|
*/
|
|
*/
|
|
if (power_rule->max_antenna_gain)
|
|
if (power_rule->max_antenna_gain)
|
|
- pr_info(" (%d KHz - %d KHz @ %s), (%d mBi, %d mBm), (%s)\n",
|
|
|
|
|
|
+ pr_debug(" (%d KHz - %d KHz @ %s), (%d mBi, %d mBm), (%s)\n",
|
|
freq_range->start_freq_khz,
|
|
freq_range->start_freq_khz,
|
|
freq_range->end_freq_khz,
|
|
freq_range->end_freq_khz,
|
|
bw,
|
|
bw,
|
|
@@ -2780,7 +2780,7 @@ static void print_rd_rules(const struct ieee80211_regdomain *rd)
|
|
power_rule->max_eirp,
|
|
power_rule->max_eirp,
|
|
cac_time);
|
|
cac_time);
|
|
else
|
|
else
|
|
- pr_info(" (%d KHz - %d KHz @ %s), (N/A, %d mBm), (%s)\n",
|
|
|
|
|
|
+ pr_debug(" (%d KHz - %d KHz @ %s), (N/A, %d mBm), (%s)\n",
|
|
freq_range->start_freq_khz,
|
|
freq_range->start_freq_khz,
|
|
freq_range->end_freq_khz,
|
|
freq_range->end_freq_khz,
|
|
bw,
|
|
bw,
|
|
@@ -2813,35 +2813,35 @@ static void print_regdomain(const struct ieee80211_regdomain *rd)
|
|
struct cfg80211_registered_device *rdev;
|
|
struct cfg80211_registered_device *rdev;
|
|
rdev = cfg80211_rdev_by_wiphy_idx(lr->wiphy_idx);
|
|
rdev = cfg80211_rdev_by_wiphy_idx(lr->wiphy_idx);
|
|
if (rdev) {
|
|
if (rdev) {
|
|
- pr_info("Current regulatory domain updated by AP to: %c%c\n",
|
|
|
|
|
|
+ pr_debug("Current regulatory domain updated by AP to: %c%c\n",
|
|
rdev->country_ie_alpha2[0],
|
|
rdev->country_ie_alpha2[0],
|
|
rdev->country_ie_alpha2[1]);
|
|
rdev->country_ie_alpha2[1]);
|
|
} else
|
|
} else
|
|
- pr_info("Current regulatory domain intersected:\n");
|
|
|
|
|
|
+ pr_debug("Current regulatory domain intersected:\n");
|
|
} else
|
|
} else
|
|
- pr_info("Current regulatory domain intersected:\n");
|
|
|
|
|
|
+ pr_debug("Current regulatory domain intersected:\n");
|
|
} else if (is_world_regdom(rd->alpha2)) {
|
|
} else if (is_world_regdom(rd->alpha2)) {
|
|
- pr_info("World regulatory domain updated:\n");
|
|
|
|
|
|
+ pr_debug("World regulatory domain updated:\n");
|
|
} else {
|
|
} else {
|
|
if (is_unknown_alpha2(rd->alpha2))
|
|
if (is_unknown_alpha2(rd->alpha2))
|
|
- pr_info("Regulatory domain changed to driver built-in settings (unknown country)\n");
|
|
|
|
|
|
+ pr_debug("Regulatory domain changed to driver built-in settings (unknown country)\n");
|
|
else {
|
|
else {
|
|
if (reg_request_cell_base(lr))
|
|
if (reg_request_cell_base(lr))
|
|
- pr_info("Regulatory domain changed to country: %c%c by Cell Station\n",
|
|
|
|
|
|
+ pr_debug("Regulatory domain changed to country: %c%c by Cell Station\n",
|
|
rd->alpha2[0], rd->alpha2[1]);
|
|
rd->alpha2[0], rd->alpha2[1]);
|
|
else
|
|
else
|
|
- pr_info("Regulatory domain changed to country: %c%c\n",
|
|
|
|
|
|
+ pr_debug("Regulatory domain changed to country: %c%c\n",
|
|
rd->alpha2[0], rd->alpha2[1]);
|
|
rd->alpha2[0], rd->alpha2[1]);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- pr_info(" DFS Master region: %s", reg_dfs_region_str(rd->dfs_region));
|
|
|
|
|
|
+ pr_debug(" DFS Master region: %s", reg_dfs_region_str(rd->dfs_region));
|
|
print_rd_rules(rd);
|
|
print_rd_rules(rd);
|
|
}
|
|
}
|
|
|
|
|
|
static void print_regdomain_info(const struct ieee80211_regdomain *rd)
|
|
static void print_regdomain_info(const struct ieee80211_regdomain *rd)
|
|
{
|
|
{
|
|
- pr_info("Regulatory domain: %c%c\n", rd->alpha2[0], rd->alpha2[1]);
|
|
|
|
|
|
+ pr_debug("Regulatory domain: %c%c\n", rd->alpha2[0], rd->alpha2[1]);
|
|
print_rd_rules(rd);
|
|
print_rd_rules(rd);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2862,7 +2862,8 @@ static int reg_set_rd_user(const struct ieee80211_regdomain *rd,
|
|
return -EALREADY;
|
|
return -EALREADY;
|
|
|
|
|
|
if (!is_valid_rd(rd)) {
|
|
if (!is_valid_rd(rd)) {
|
|
- pr_err("Invalid regulatory domain detected:\n");
|
|
|
|
|
|
+ pr_err("Invalid regulatory domain detected: %c%c\n",
|
|
|
|
+ rd->alpha2[0], rd->alpha2[1]);
|
|
print_regdomain_info(rd);
|
|
print_regdomain_info(rd);
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
@@ -2898,7 +2899,8 @@ static int reg_set_rd_driver(const struct ieee80211_regdomain *rd,
|
|
return -EALREADY;
|
|
return -EALREADY;
|
|
|
|
|
|
if (!is_valid_rd(rd)) {
|
|
if (!is_valid_rd(rd)) {
|
|
- pr_err("Invalid regulatory domain detected:\n");
|
|
|
|
|
|
+ pr_err("Invalid regulatory domain detected: %c%c\n",
|
|
|
|
+ rd->alpha2[0], rd->alpha2[1]);
|
|
print_regdomain_info(rd);
|
|
print_regdomain_info(rd);
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
@@ -2956,7 +2958,8 @@ static int reg_set_rd_country_ie(const struct ieee80211_regdomain *rd,
|
|
*/
|
|
*/
|
|
|
|
|
|
if (!is_valid_rd(rd)) {
|
|
if (!is_valid_rd(rd)) {
|
|
- pr_err("Invalid regulatory domain detected:\n");
|
|
|
|
|
|
+ pr_err("Invalid regulatory domain detected: %c%c\n",
|
|
|
|
+ rd->alpha2[0], rd->alpha2[1]);
|
|
print_regdomain_info(rd);
|
|
print_regdomain_info(rd);
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|