Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 856a4ef9 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

rtlwifi: fix usage of freq_reg_info() 



freq_reg_info() expects KHz and not MHz, fix this. In
this case we'll now be getting the no-ir flags cleared
on channels for any channel when the country IE trusts
that channel.

@@
struct ieee80211_channel *ch;
struct wiphy *wiphy;
const struct ieee80211_reg_rule *rule;
@@

-rule = freq_reg_info(wiphy, ch->center_freq);
+rule = freq_reg_info(wiphy, MHZ_TO_KHZ(ch->center_freq));

Generated-by: Coccinelle SmPL
Cc: Julia Lawall <julia.lawall@lip6.fr>
Cc: Peter Senna Tschudin <peter.senna@gmail.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Reported-by: default avatarMihir Shete <smihir@qti.qualcomm.com>
Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@do-not-panic.com>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 685cc471

drivers/net/wireless/rtlwifi/regd.c

+4 −3
Original line number Diff line number Diff line
@@ -168,7 +168,8 @@ static void _rtl_reg_apply_beaconing_flags(struct wiphy *wiphy, 
			    (ch->flags & IEEE80211_CHAN_RADAR))

				continue;

			if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE) {

				reg_rule = freq_reg_info(wiphy, ch->center_freq);

				reg_rule = freq_reg_info(wiphy,

							 MHZ_TO_KHZ(ch->center_freq));

				if (IS_ERR(reg_rule))

					continue;
@@ -226,7 +227,7 @@ static void _rtl_reg_apply_active_scan_flags(struct wiphy *wiphy, 
	 */



	ch = &sband->channels[11];	/* CH 12 */

	reg_rule = freq_reg_info(wiphy, ch->center_freq);

	reg_rule = freq_reg_info(wiphy, MHZ_TO_KHZ(ch->center_freq));

	if (!IS_ERR(reg_rule)) {

		if (!(reg_rule->flags & NL80211_RRF_NO_IR))

			if (ch->flags & IEEE80211_CHAN_NO_IR)
@@ -234,7 +235,7 @@ static void _rtl_reg_apply_active_scan_flags(struct wiphy *wiphy, 
	}



	ch = &sband->channels[12];	/* CH 13 */

	reg_rule = freq_reg_info(wiphy, ch->center_freq);

	reg_rule = freq_reg_info(wiphy, MHZ_TO_KHZ(ch->center_freq));

	if (!IS_ERR(reg_rule)) {

		if (!(reg_rule->flags & NL80211_RRF_NO_IR))

			if (ch->flags & IEEE80211_CHAN_NO_IR)