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

Commit f3b2098d authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: mvm: BT Coex - move BT_ANTENNA_COUPLING_THRESHOLD to constants 



This is were it really needs to be.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent c7583d7d

drivers/net/wireless/iwlwifi/mvm/coex.c

+1 −3
Original line number Diff line number Diff line
@@ -72,8 +72,6 @@ 
#include "mvm.h"

#include "iwl-debug.h"



#define BT_ANTENNA_COUPLING_THRESHOLD		(30)



const u32 iwl_bt_ctl_kill_msk[BT_KILL_MSK_MAX] = {

	[BT_KILL_MSK_DEFAULT] = 0xfffffc00,

	[BT_KILL_MSK_NEVER] = 0xffffffff,
@@ -605,7 +603,7 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm) 


	bt_cmd->max_kill = cpu_to_le32(5);

	bt_cmd->bt4_antenna_isolation_thr =

				cpu_to_le32(BT_ANTENNA_COUPLING_THRESHOLD);

		cpu_to_le32(IWL_MVM_BT_COEX_ANTENNA_COUPLING_THRS);

	bt_cmd->bt4_tx_tx_delta_freq_thr = cpu_to_le32(15);

	bt_cmd->bt4_tx_rx_max_freq0 = cpu_to_le32(15);

	bt_cmd->override_primary_lut = cpu_to_le32(BT_COEX_INVALID_LUT);

drivers/net/wireless/iwlwifi/mvm/coex_legacy.c

+2 −3
Original line number Diff line number Diff line
@@ -102,8 +102,6 @@ static const u8 iwl_bt_prio_tbl[BT_COEX_PRIO_TBL_EVT_MAX] = { 


#undef EVENT_PRIO_ANT



#define BT_ANTENNA_COUPLING_THRESHOLD		(30)



static int iwl_send_bt_prio_tbl(struct iwl_mvm *mvm)

{

	if (unlikely(mvm->bt_force_ant_mode != BT_FORCE_ANT_DIS))
@@ -593,7 +591,8 @@ int iwl_send_bt_init_conf_old(struct iwl_mvm *mvm) 
	}



	bt_cmd->max_kill = 5;

	bt_cmd->bt4_antenna_isolation_thr = BT_ANTENNA_COUPLING_THRESHOLD;

	bt_cmd->bt4_antenna_isolation_thr =

		IWL_MVM_BT_COEX_ANTENNA_COUPLING_THRS;

	bt_cmd->bt4_antenna_isolation = iwlwifi_mod_params.ant_coupling;

	bt_cmd->bt4_tx_tx_delta_freq_thr = 15;

	bt_cmd->bt4_tx_rx_max_freq0 = 15;

drivers/net/wireless/iwlwifi/mvm/constants.h

+1 −0
Original line number Diff line number Diff line
@@ -96,5 +96,6 @@ 
#define IWL_MVM_QUOTA_THRESHOLD			8

#define IWL_MVM_RS_RSSI_BASED_INIT_RATE         0

#define IWL_MVM_RS_DISABLE_MIMO			0

#define IWL_MVM_BT_COEX_ANTENNA_COUPLING_THRS	30



#endif /* __MVM_CONSTANTS_H */