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

Commit c0b34e2b authored by Mohammed Shafi Shajakhan's avatar Mohammed Shafi Shajakhan Committed by Kalle Valo
Browse files

ath6kl: Rename ATH6KL_HW_FLAG_64BIT_RATES 



Rename ATH6KL_HW_FLAG_64BIT_RATES to ATH6KL_HW_64BIT_RATES.
This seemed to be necessary to add/use new hardware flags
without exceeding 80 lines. We shall be adding new hw flags
dropping the FLAG term.

Signed-off-by: default avatarMohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 5dbdf6fe

drivers/net/wireless/ath/ath6kl/cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -3708,7 +3708,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar) 
		ath6kl_band_5ghz.ht_cap.ht_supported = false;

	}



	if (ar->hw.flags & ATH6KL_HW_FLAG_64BIT_RATES) {

	if (ar->hw.flags & ATH6KL_HW_64BIT_RATES) {

		ath6kl_band_2ghz.ht_cap.mcs.rx_mask[0] = 0xff;

		ath6kl_band_5ghz.ht_cap.mcs.rx_mask[0] = 0xff;

		ath6kl_band_2ghz.ht_cap.mcs.rx_mask[1] = 0xff;

drivers/net/wireless/ath/ath6kl/core.h

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ struct ath6kl_fw_ie { 
};



enum ath6kl_hw_flags {

	ATH6KL_HW_FLAG_64BIT_RATES	= BIT(0),

	ATH6KL_HW_64BIT_RATES	= BIT(0),

};



#define ATH6KL_FW_API2_FILE "fw-2.bin"

drivers/net/wireless/ath/ath6kl/init.c

+4 −4
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static const struct ath6kl_hw hw_list[] = { 
		.board_addr			= 0x433900,

		.refclk_hz			= 26000000,

		.uarttx_pin			= 11,

		.flags				= ATH6KL_HW_FLAG_64BIT_RATES,

		.flags				= ATH6KL_HW_64BIT_RATES,



		.fw = {

			.dir		= AR6004_HW_1_0_FW_DIR,
@@ -113,7 +113,7 @@ static const struct ath6kl_hw hw_list[] = { 
		.board_addr			= 0x43d400,

		.refclk_hz			= 40000000,

		.uarttx_pin			= 11,

		.flags				= ATH6KL_HW_FLAG_64BIT_RATES,

		.flags				= ATH6KL_HW_64BIT_RATES,



		.fw = {

			.dir		= AR6004_HW_1_1_FW_DIR,
@@ -133,7 +133,7 @@ static const struct ath6kl_hw hw_list[] = { 
		.board_addr			= 0x435c00,

		.refclk_hz			= 40000000,

		.uarttx_pin			= 11,

		.flags				= ATH6KL_HW_FLAG_64BIT_RATES,

		.flags				= ATH6KL_HW_64BIT_RATES,



		.fw = {

			.dir		= AR6004_HW_1_2_FW_DIR,
@@ -152,7 +152,7 @@ static const struct ath6kl_hw hw_list[] = { 
		.board_addr			= 0x436400,

		.refclk_hz                      = 40000000,

		.uarttx_pin                     = 11,

		.flags                          = ATH6KL_HW_FLAG_64BIT_RATES,

		.flags                          = ATH6KL_HW_64BIT_RATES,



		.fw = {

			.dir            = AR6004_HW_1_3_FW_DIR,

drivers/net/wireless/ath/ath6kl/wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -2828,7 +2828,7 @@ int ath6kl_wmi_set_bitrate_mask(struct wmi *wmi, u8 if_idx, 
{

	struct ath6kl *ar = wmi->parent_dev;



	if (ar->hw.flags & ATH6KL_HW_FLAG_64BIT_RATES)

	if (ar->hw.flags & ATH6KL_HW_64BIT_RATES)

		return ath6kl_set_bitrate_mask64(wmi, if_idx, mask);

	else

		return ath6kl_set_bitrate_mask32(wmi, if_idx, mask);