Commit 570eec3d authored by Maharaja Kennadyrajan's avatar Maharaja Kennadyrajan Committed by Kalle Valo
Browse files

wifi: ath11k: Relocate the func ath11k_mac_bitrate_mask_num_ht_rates() and... 


wifi: ath11k: Relocate the func ath11k_mac_bitrate_mask_num_ht_rates() and change hweight16 to hweight8

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: default avatarMaharaja Kennadyrajan <quic_mkenna@quicinc.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20230504092033.3542456-2-quic_mkenna@quicinc.com
parent 1fd2c3f9

drivers/net/wireless/ath/ath11k/mac.c

+15 −15
Original line number Diff line number Diff line 
// 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>
@@ -4337,6 +4337,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,
@@ -7791,20 +7805,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,