Commit 57b7b345 authored by Miri Korenblit's avatar Miri Korenblit Committed by Luca Coelho
Browse files

iwlwifi: mvm: Remove antenna c references 



Since antenna c is not in use and won't be relevant after the new rate &
flags, remove all it's references

Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211017113927.5e39106ec75b.I4281edc844f734bf9591396a5cc8009ad37ccda8@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 8a2c1516

drivers/net/wireless/intel/iwlwifi/fw/api/location.h

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ enum iwl_tof_responder_cfg_flags { 
	IWL_TOF_RESPONDER_FLAGS_SPECIFIC_CALIB_MODE = BIT(8),

	IWL_TOF_RESPONDER_FLAGS_FAST_ALGO_SUPPORT = BIT(9),

	IWL_TOF_RESPONDER_FLAGS_RETRY_ON_ALGO_FAIL = BIT(10),

	IWL_TOF_RESPONDER_FLAGS_FTM_TX_ANT = RATE_MCS_ANT_ABC_MSK,

	IWL_TOF_RESPONDER_FLAGS_FTM_TX_ANT = RATE_MCS_ANT_AB_MSK,

	IWL_TOF_RESPONDER_FLAGS_NDP_SUPPORT = BIT(24),

	IWL_TOF_RESPONDER_FLAGS_LMR_FEEDBACK = BIT(25),

	IWL_TOF_RESPONDER_FLAGS_SESSION_ID = BIT(27),

drivers/net/wireless/intel/iwlwifi/fw/api/rs.h

+1 −4
Original line number Diff line number Diff line
@@ -372,12 +372,9 @@ enum { 
#define RATE_MCS_ANT_POS		14

#define RATE_MCS_ANT_A_MSK		(1 << RATE_MCS_ANT_POS)

#define RATE_MCS_ANT_B_MSK		(2 << RATE_MCS_ANT_POS)

#define RATE_MCS_ANT_C_MSK		(4 << RATE_MCS_ANT_POS)

#define RATE_MCS_ANT_AB_MSK		(RATE_MCS_ANT_A_MSK | \

					 RATE_MCS_ANT_B_MSK)

#define RATE_MCS_ANT_ABC_MSK		(RATE_MCS_ANT_AB_MSK | \

					 RATE_MCS_ANT_C_MSK)

#define RATE_MCS_ANT_MSK		RATE_MCS_ANT_ABC_MSK

#define RATE_MCS_ANT_MSK		RATE_MCS_ANT_AB_MSK



/* Bit 17: (0) SS, (1) SS*2 */

#define RATE_MCS_STBC_POS		17

drivers/net/wireless/intel/iwlwifi/fw/api/rx.h

+1 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/*

 * Copyright (C) 2012-2014, 2018-2020 Intel Corporation

 * Copyright (C) 2012-2014, 2018-2021 Intel Corporation

 * Copyright (C) 2013-2015 Intel Mobile Communications GmbH

 * Copyright (C) 2015-2017 Intel Deutschland GmbH

 */
@@ -13,7 +13,6 @@ 
#define IWL_RX_INFO_ENERGY_ANT_ABC_IDX 1

#define IWL_RX_INFO_ENERGY_ANT_A_MSK 0x000000ff

#define IWL_RX_INFO_ENERGY_ANT_B_MSK 0x0000ff00

#define IWL_RX_INFO_ENERGY_ANT_C_MSK 0x00ff0000

#define IWL_RX_INFO_ENERGY_ANT_A_POS 0

#define IWL_RX_INFO_ENERGY_ANT_B_POS 8

#define IWL_RX_INFO_ENERGY_ANT_C_POS 16

drivers/net/wireless/intel/iwlwifi/fw/api/tx.h

+1 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/*

 * Copyright (C) 2012-2014, 2018-2020 Intel Corporation

 * Copyright (C) 2012-2014, 2018-2021 Intel Corporation

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */

#ifndef __iwl_fw_api_tx_h__
@@ -759,7 +759,6 @@ enum iwl_mac_beacon_flags { 
	IWL_MAC_BEACON_CCK	= BIT(8),

	IWL_MAC_BEACON_ANT_A	= BIT(9),

	IWL_MAC_BEACON_ANT_B	= BIT(10),

	IWL_MAC_BEACON_ANT_C	= BIT(11),

	IWL_MAC_BEACON_FILS	= BIT(12),

};

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ enum iwl_nvm_type { 
#define	ANT_AC		(ANT_A | ANT_C)

#define ANT_BC		(ANT_B | ANT_C)

#define ANT_ABC		(ANT_A | ANT_B | ANT_C)

#define MAX_ANT_NUM 3





static inline u8 num_of_ant(u8 mask)