aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-10-15 08:27:04 -0400
committerJohannes Berg <johannes.berg@intel.com>2015-10-16 03:15:45 -0400
commit81e925747e1c2ef2fa0316c2cd74410c65242a9e (patch)
treed2571f4b2ea2118bcfa7948d1a2cb4e51e1320ff /net/wireless
parent9f5068029274a15bf0a92f77e126fe52c3551c19 (diff)
cfg80211: reg: reduce chan_reg_rule_print_dbg() ifdef
The function is void and static, so just ifdef its contents instead of duplicating the declaration. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/reg.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 12c4b84d5f96..b870369fb62e 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1130,11 +1130,11 @@ const char *reg_initiator_name(enum nl80211_reg_initiator initiator)
1130} 1130}
1131EXPORT_SYMBOL(reg_initiator_name); 1131EXPORT_SYMBOL(reg_initiator_name);
1132 1132
1133#ifdef CONFIG_CFG80211_REG_DEBUG
1134static void chan_reg_rule_print_dbg(const struct ieee80211_regdomain *regd, 1133static void chan_reg_rule_print_dbg(const struct ieee80211_regdomain *regd,
1135 struct ieee80211_channel *chan, 1134 struct ieee80211_channel *chan,
1136 const struct ieee80211_reg_rule *reg_rule) 1135 const struct ieee80211_reg_rule *reg_rule)
1137{ 1136{
1137#ifdef CONFIG_CFG80211_REG_DEBUG
1138 const struct ieee80211_power_rule *power_rule; 1138 const struct ieee80211_power_rule *power_rule;
1139 const struct ieee80211_freq_range *freq_range; 1139 const struct ieee80211_freq_range *freq_range;
1140 char max_antenna_gain[32], bw[32]; 1140 char max_antenna_gain[32], bw[32];
@@ -1163,15 +1163,8 @@ static void chan_reg_rule_print_dbg(const struct ieee80211_regdomain *regd,
1163 freq_range->start_freq_khz, freq_range->end_freq_khz, 1163 freq_range->start_freq_khz, freq_range->end_freq_khz,
1164 bw, max_antenna_gain, 1164 bw, max_antenna_gain,
1165 power_rule->max_eirp); 1165 power_rule->max_eirp);
1166}
1167#else
1168static void chan_reg_rule_print_dbg(const struct ieee80211_regdomain *regd,
1169 struct ieee80211_channel *chan,
1170 const struct ieee80211_reg_rule *reg_rule)
1171{
1172 return;
1173}
1174#endif 1166#endif
1167}
1175 1168
1176/* 1169/*
1177 * Note that right now we assume the desired channel bandwidth 1170 * Note that right now we assume the desired channel bandwidth