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

Commit 5b7ff615 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: mvm: make bt-coex.c generic 



Make bt-coex generic to allow other coex mechanisms.

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

drivers/net/wireless/iwlwifi/mvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ obj-$(CONFIG_IWLMVM) += iwlmvm.o 
iwlmvm-y += fw.o mac80211.o nvm.o ops.o phy-ctxt.o mac-ctxt.o

iwlmvm-y += utils.o rx.o tx.o binding.o quota.o sta.o sf.o

iwlmvm-y += scan.o time-event.o rs.o

iwlmvm-y += power.o bt-coex.o

iwlmvm-y += power.o coex.o

iwlmvm-y += led.o tt.o

iwlmvm-$(CONFIG_IWLWIFI_DEBUGFS) += debugfs.o debugfs-vif.o

iwlmvm-$(CONFIG_PM_SLEEP) += d3.o

drivers/net/wireless/iwlwifi/mvm/bt-coex.c→drivers/net/wireless/iwlwifi/mvm/coex.c

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 


#include <net/mac80211.h>



#include "fw-api-bt-coex.h"

#include "fw-api-coex.h"

#include "iwl-modparams.h"

#include "mvm.h"

#include "iwl-debug.h"
@@ -1168,7 +1168,7 @@ void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
#define LINK_QUAL_AGG_TIME_LIMIT_DEF	(4000)

#define LINK_QUAL_AGG_TIME_LIMIT_BT_ACT	(1200)



u16 iwl_mvm_bt_coex_agg_time_limit(struct iwl_mvm *mvm,

u16 iwl_mvm_coex_agg_time_limit(struct iwl_mvm *mvm,

				struct ieee80211_sta *sta)

{

	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);

drivers/net/wireless/iwlwifi/mvm/fw-api.h

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
#include "fw-api-mac.h"

#include "fw-api-power.h"

#include "fw-api-d3.h"

#include "fw-api-bt-coex.h"

#include "fw-api-coex.h"



/* maximal number of Tx queues in any platform */

#define IWL_MVM_MAX_QUEUES	20

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

+2 −2
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ int iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm, 
void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

			   enum ieee80211_rssi_event rssi_event);

void iwl_mvm_bt_coex_vif_change(struct iwl_mvm *mvm);

u16 iwl_mvm_bt_coex_agg_time_limit(struct iwl_mvm *mvm,

u16 iwl_mvm_coex_agg_time_limit(struct iwl_mvm *mvm,

				struct ieee80211_sta *sta);

bool iwl_mvm_bt_coex_is_mimo_allowed(struct iwl_mvm *mvm,

				     struct ieee80211_sta *sta);