summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-10-15 14:27:04 +0200
committerJohannes Berg <johannes.berg@intel.com>2015-10-16 09:15:45 +0200
commit81e925747e1c2ef2fa0316c2cd74410c65242a9e (patch)
treed2571f4b2ea2118bcfa7948d1a2cb4e51e1320ff /net/wireless
parent9f5068029274a15bf0a92f77e126fe52c3551c19 (diff)
downloadop-kernel-dev-81e925747e1c2ef2fa0316c2cd74410c65242a9e.zip
op-kernel-dev-81e925747e1c2ef2fa0316c2cd74410c65242a9e.tar.gz
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 12c4b84..b870369 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)
}
EXPORT_SYMBOL(reg_initiator_name);
-#ifdef CONFIG_CFG80211_REG_DEBUG
static void chan_reg_rule_print_dbg(const struct ieee80211_regdomain *regd,
struct ieee80211_channel *chan,
const struct ieee80211_reg_rule *reg_rule)
{
+#ifdef CONFIG_CFG80211_REG_DEBUG
const struct ieee80211_power_rule *power_rule;
const struct ieee80211_freq_range *freq_range;
char max_antenna_gain[32], bw[32];
@@ -1163,15 +1163,8 @@ static void chan_reg_rule_print_dbg(const struct ieee80211_regdomain *regd,
freq_range->start_freq_khz, freq_range->end_freq_khz,
bw, max_antenna_gain,
power_rule->max_eirp);
-}
-#else
-static void chan_reg_rule_print_dbg(const struct ieee80211_regdomain *regd,
- struct ieee80211_channel *chan,
- const struct ieee80211_reg_rule *reg_rule)
-{
- return;
-}
#endif
+}
/*
* Note that right now we assume the desired channel bandwidth
OpenPOWER on IntegriCloud