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

Commit 8e484f0b authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: mvm: BT Coex - track bandwidth changes in HT 



BT Coex needs to be updated when the bandwidth is modified
by the AP.
While at it, remove the vif parameter from
bt_coex_vif_change since it was unused.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6d9d32b8

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

+1 −1
Original line number Diff line number Diff line
@@ -921,7 +921,7 @@ u16 iwl_mvm_bt_coex_agg_time_limit(struct iwl_mvm *mvm, 
	return LINK_QUAL_AGG_TIME_LIMIT_BT_ACT;

}



void iwl_mvm_bt_coex_vif_change(struct iwl_mvm *mvm, struct ieee80211_vif *vif)

void iwl_mvm_bt_coex_vif_change(struct iwl_mvm *mvm)

{

	if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_NEWBT_COEX))

		return;

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

+4 −3
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, 
			if (ret)

				IWL_ERR(mvm, "failed to update power mode\n");

		}

		iwl_mvm_bt_coex_vif_change(mvm, vif);

		iwl_mvm_bt_coex_vif_change(mvm);

	} else if (changes & BSS_CHANGED_BEACON_INFO) {

		/*

		 * We received a beacon _after_ association so
@@ -931,7 +931,7 @@ static int iwl_mvm_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 
	if (vif->p2p && mvm->p2p_device_vif)

		iwl_mvm_mac_ctxt_changed(mvm, mvm->p2p_device_vif);



	iwl_mvm_bt_coex_vif_change(mvm, vif);

	iwl_mvm_bt_coex_vif_change(mvm);



	mutex_unlock(&mvm->mutex);

	return 0;
@@ -958,7 +958,7 @@ static void iwl_mvm_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 


	mvmvif->ap_active = false;



	iwl_mvm_bt_coex_vif_change(mvm, vif);

	iwl_mvm_bt_coex_vif_change(mvm);



	/* Need to update the P2P Device MAC */

	if (vif->p2p && mvm->p2p_device_vif)
@@ -1540,6 +1540,7 @@ static void iwl_mvm_change_chanctx(struct ieee80211_hw *hw, 
	iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, &ctx->def,

				 ctx->rx_chains_static,

				 ctx->rx_chains_dynamic);

	iwl_mvm_bt_coex_vif_change(mvm);

	mutex_unlock(&mvm->mutex);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ int iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm, 
			     struct iwl_device_cmd *cmd);

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, struct ieee80211_vif *vif);

void iwl_mvm_bt_coex_vif_change(struct iwl_mvm *mvm);

u16 iwl_mvm_bt_coex_agg_time_limit(struct iwl_mvm *mvm,

				   struct ieee80211_sta *sta);

enum iwl_bt_kill_msk {