Re: [PATCH 3/3] rtlwifi: fix usage of freq_reg_info()

[Larry Finger <Larry.Finger@lwfinger.net>]

On 10/29/2013 01:34 PM, Luis R. Rodriguez wrote:
> 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: Mihir Shete <smihir@qti.qualcomm.com>
> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
> ---

This patch got some fuzz on my system in hunks 2 & 3 and failed "git am". With 
patch, it yielded correct code despite the fuzz.

Acked-by: Larry Finger <Larry.Finger@lwfinger.net>

Larry

>   drivers/net/wireless/rtlwifi/regd.c | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/rtlwifi/regd.c b/drivers/net/wireless/rtlwifi/regd.c
> index 2e1642c..29d2813 100644
> --- a/drivers/net/wireless/rtlwifi/regd.c
> +++ b/drivers/net/wireless/rtlwifi/regd.c
> @@ -169,7 +169,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;
>
> @@ -228,7 +229,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)
> @@ -236,7 +237,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)
>