aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@qca.qualcomm.com>2011-12-20 15:23:37 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-01-04 14:30:40 -0500
commit6653325a556ef5a838ed7d3a0a6552f0efc72739 (patch)
treec1e927673a6b6b394166684c6e798619685c9fb6 /net
parent8848bef0382af53a7c9568bbc6757db97c53a0e3 (diff)
cfg80211: replace reg.c Nokia commit 269ac5
Nokia hasn't gotten back to me in over 1 month for a relicense change request. There are only a few changes that they contributed, so just reverting their changes but replacing with another set. This change replaces this commit: commit 269ac5fd2d75b118d76a2291e28796527db2f3f8 Author: Kalle Valo <kalle.valo@nokia.com> Date: Tue Dec 1 10:47:15 2009 +0200 cfg80211: indent regulatory messages with spaces The regulatory messages in syslog look weird: kernel: cfg80211: Regulatory domain: US kernel: ^I(start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp) kernel: ^I(2402000 KHz - 2472000 KHz @ 40000 KHz), (600 mBi, 2700 mBm) kernel: ^I(5170000 KHz - 5190000 KHz @ 40000 KHz), (600 mBi, 2300 mBm) kernel: ^I(5190000 KHz - 5210000 KHz @ 40000 KHz), (600 mBi, 2300 mBm) kernel: ^I(5210000 KHz - 5230000 KHz @ 40000 KHz), (600 mBi, 2300 mBm) kernel: ^I(5230000 KHz - 5330000 KHz @ 40000 KHz), (600 mBi, 2300 mBm) kernel: ^I(5735000 KHz - 5835000 KHz @ 40000 KHz), (600 mBi, 3000 mBm) Indent them with four spaces instead of the tab character to get prettier output. Signed-off-by: Kalle Valo <kalle.valo@nokia.com> Acked: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Cc: Petri Karhula <petri.karhula@nokia.com> Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/reg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 728a8fdf04b..ef47b418c86 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1990,7 +1990,7 @@ static void print_rd_rules(const struct ieee80211_regdomain *rd)
1990 const struct ieee80211_freq_range *freq_range = NULL; 1990 const struct ieee80211_freq_range *freq_range = NULL;
1991 const struct ieee80211_power_rule *power_rule = NULL; 1991 const struct ieee80211_power_rule *power_rule = NULL;
1992 1992
1993 pr_info(" (start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp)\n"); 1993 pr_info(" (start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp)\n");
1994 1994
1995 for (i = 0; i < rd->n_reg_rules; i++) { 1995 for (i = 0; i < rd->n_reg_rules; i++) {
1996 reg_rule = &rd->reg_rules[i]; 1996 reg_rule = &rd->reg_rules[i];
@@ -2002,14 +2002,14 @@ static void print_rd_rules(const struct ieee80211_regdomain *rd)
2002 * in certain regions 2002 * in certain regions
2003 */ 2003 */
2004 if (power_rule->max_antenna_gain) 2004 if (power_rule->max_antenna_gain)
2005 pr_info(" (%d KHz - %d KHz @ %d KHz), (%d mBi, %d mBm)\n", 2005 pr_info(" (%d KHz - %d KHz @ %d KHz), (%d mBi, %d mBm)\n",
2006 freq_range->start_freq_khz, 2006 freq_range->start_freq_khz,
2007 freq_range->end_freq_khz, 2007 freq_range->end_freq_khz,
2008 freq_range->max_bandwidth_khz, 2008 freq_range->max_bandwidth_khz,
2009 power_rule->max_antenna_gain, 2009 power_rule->max_antenna_gain,
2010 power_rule->max_eirp); 2010 power_rule->max_eirp);
2011 else 2011 else
2012 pr_info(" (%d KHz - %d KHz @ %d KHz), (N/A, %d mBm)\n", 2012 pr_info(" (%d KHz - %d KHz @ %d KHz), (N/A, %d mBm)\n",
2013 freq_range->start_freq_khz, 2013 freq_range->start_freq_khz,
2014 freq_range->end_freq_khz, 2014 freq_range->end_freq_khz,
2015 freq_range->max_bandwidth_khz, 2015 freq_range->max_bandwidth_khz,