[PATCH 1/2] ath11k: Relocate the func ath11k_mac_bitrate_mask_num_ht_rates() and change hweight16 to hweight8

Maharaja Kennadyrajan quic_mkenna at quicinc.com
Wed May 10 03:05:20 PDT 2023


Hi,

Ignore this patchset, I have sent the v2 version of this patchset by 
rebasing it on latest TOT.

> Relocate the function ath11k_mac_bitrate_mask_num_ht_rates() definition
> to call this function from other functions which helps to avoid the
> compilation error (function not defined).
>
> ht_mcs[] is 1 byte array and it is enough to use hweight8() instead
> of hweight16(). Hence, fixed the same.
>
> Tested on: Compile tested only.
>
> Signed-off-by: Maharaja Kennadyrajan <quic_mkenna at quicinc.com>
> ---
>   drivers/net/wireless/ath/ath11k/mac.c | 30 +++++++++++++--------------
>   1 file changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
> index 05920ad413c5..eb46d06272de 100644
> --- a/drivers/net/wireless/ath/ath11k/mac.c
> +++ b/drivers/net/wireless/ath/ath11k/mac.c
> @@ -1,7 +1,7 @@
>   // SPDX-License-Identifier: BSD-3-Clause-Clear
>   /*
>    * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
> - * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
> + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
>    */
>   
>   #include <net/mac80211.h>
> @@ -4159,6 +4159,20 @@ static int ath11k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
>   	return ret;
>   }
>   
> +static int
> +ath11k_mac_bitrate_mask_num_ht_rates(struct ath11k *ar,
> +				     enum nl80211_band band,
> +				     const struct cfg80211_bitrate_mask *mask)
> +{
> +	int num_rates = 0;
> +	int i;
> +
> +	for (i = 0; i < ARRAY_SIZE(mask->control[band].ht_mcs); i++)
> +		num_rates += hweight8(mask->control[band].ht_mcs[i]);
> +
> +	return num_rates;
> +}
> +
>   static int
>   ath11k_mac_bitrate_mask_num_vht_rates(struct ath11k *ar,
>   				      enum nl80211_band band,
> @@ -7542,20 +7556,6 @@ static void ath11k_mac_op_flush(struct ieee80211_hw *hw, struct ieee80211_vif *v
>   	ath11k_mac_flush_tx_complete(ar);
>   }
>   
> -static int
> -ath11k_mac_bitrate_mask_num_ht_rates(struct ath11k *ar,
> -				     enum nl80211_band band,
> -				     const struct cfg80211_bitrate_mask *mask)
> -{
> -	int num_rates = 0;
> -	int i;
> -
> -	for (i = 0; i < ARRAY_SIZE(mask->control[band].ht_mcs); i++)
> -		num_rates += hweight16(mask->control[band].ht_mcs[i]);
> -
> -	return num_rates;
> -}
> -
>   static bool
>   ath11k_mac_has_single_legacy_rate(struct ath11k *ar,
>   				  enum nl80211_band band,



More information about the ath11k mailing list