Commit b88d26d9 authored Aug 21, 2018 by Haim Dreyfuss Committed by Johannes Berg Aug 28, 2018

nl80211: Pass center frequency in kHz instead of MHz



freq_reg_info expects to get the frequency in kHz. Instead we
accidently pass it in MHz.  Thus, currently the function always
return ERR rule. Fix that.

Fixes: 50f32718 ("nl80211: Add wmm rule attribute to NL80211_CMD_GET_WIPHY dump command")
Signed-off-by: Haim Dreyfuss <haim.dreyfuss@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
[fix kHz/MHz in commit message]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent d3c89bbc

net/wireless/nl80211.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -764,7 +764,7 @@ static int nl80211_msg_put_channel(struct sk_buff msg, struct wiphy wiphy,

		if (large) {
		const struct ieee80211_reg_rule *rule =
		freq_reg_info(wiphy, chan->center_freq);
		freq_reg_info(wiphy, MHZ_TO_KHZ(chan->center_freq));

		if (!IS_ERR_OR_NULL(rule) && rule->has_wmm) {
		if (nl80211_msg_put_wmm_rules(msg, rule))

Admin message