Commit 60efeca1 authored by Miri Korenblit's avatar Miri Korenblit Committed by Johannes Berg
Browse files

wifi: iwlwifi: mvm: Add a remove_interface() callback for mld mode 



As the MLD mode and its new APIs are introduced,
we've decided to add a new ieee80211_ops dedicated for
MLD callbacks. Add the MLD remove_interface() callback
which uses the new MLD APIs.

Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230314194113.b87c5c0a4b6b.I631173a73d6ffd7232aa539ea8b356a222fac398@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1ab26632

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

+26 −6
Original line number Diff line number Diff line
@@ -1579,7 +1579,11 @@ static void iwl_mvm_prepare_mac_removal(struct iwl_mvm *mvm, 
	}

}



static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw,

/* This function is doing the common part of removing the interface for

 * both - MLD and non-MLD modes. Returns true if removing the interface

 * is done

 */

bool iwl_mvm_mac_remove_interface_common(struct ieee80211_hw *hw,

					 struct ieee80211_vif *vif)

{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
@@ -1628,11 +1632,22 @@ static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw, 
			mvm->noa_duration = 0;

		}

#endif

		iwl_mvm_dealloc_int_sta(mvm, &mvmvif->mcast_sta);

		iwl_mvm_dealloc_bcast_sta(mvm, vif);

		goto out_release;

		return true;

	}



	iwl_mvm_power_update_mac(mvm);

	return false;

}



static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw,

					 struct ieee80211_vif *vif)

{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);



	if (iwl_mvm_mac_remove_interface_common(hw, vif))

		goto out;



	if (vif->type == NL80211_IFTYPE_P2P_DEVICE) {

		mvm->p2p_device_vif = NULL;

		iwl_mvm_rm_p2p_bcast_sta(mvm, vif);
@@ -1641,7 +1656,6 @@ static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw, 
		mvmvif->phy_ctxt = NULL;

	}



	iwl_mvm_power_update_mac(mvm);

	iwl_mvm_mac_ctxt_remove(mvm, vif);



	RCU_INIT_POINTER(mvm->vif_id_to_mac[mvmvif->id], NULL);
@@ -1649,7 +1663,13 @@ static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw, 
	if (vif->type == NL80211_IFTYPE_MONITOR)

		mvm->monitor_on = false;



out_release:

out:

	if (vif->type == NL80211_IFTYPE_AP ||

	    vif->type == NL80211_IFTYPE_ADHOC) {

		iwl_mvm_dealloc_int_sta(mvm, &mvmvif->mcast_sta);

		iwl_mvm_dealloc_bcast_sta(mvm, vif);

	}



	mutex_unlock(&mvm->mutex);

}

drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c

+34 −0
Original line number Diff line number Diff line
@@ -113,6 +113,40 @@ static int iwl_mvm_mld_mac_add_interface(struct ieee80211_hw *hw, 
	return ret;

}



static void iwl_mvm_mld_mac_remove_interface(struct ieee80211_hw *hw,

					     struct ieee80211_vif *vif)

{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);



	if (iwl_mvm_mac_remove_interface_common(hw, vif))

		goto out;



	if (vif->type == NL80211_IFTYPE_P2P_DEVICE) {

		mvm->p2p_device_vif = NULL;

		iwl_mvm_mld_rm_bcast_sta(mvm, vif);

		/* Link needs to be deactivated before removal */

		iwl_mvm_link_changed(mvm, vif, LINK_CONTEXT_MODIFY_ACTIVE,

				     false);

		iwl_mvm_remove_link(mvm, vif);

		iwl_mvm_phy_ctxt_unref(mvm, mvmvif->phy_ctxt);

		mvmvif->phy_ctxt = NULL;

	}



	iwl_mvm_mld_mac_ctxt_remove(mvm, vif);



	RCU_INIT_POINTER(mvm->vif_id_to_mac[mvmvif->id], NULL);



	if (vif->type == NL80211_IFTYPE_MONITOR) {

		mvm->monitor_on = false;

		__clear_bit(IEEE80211_HW_RX_INCLUDES_FCS, mvm->hw->flags);

	}



out:

	mutex_unlock(&mvm->mutex);

}



const struct ieee80211_ops iwl_mvm_mld_hw_ops = {

	.add_interface = iwl_mvm_mld_mac_add_interface,

	.remove_interface = iwl_mvm_mld_mac_remove_interface,

};

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

+2 −0
Original line number Diff line number Diff line
@@ -1645,6 +1645,8 @@ u8 iwl_mvm_get_ctrl_pos(struct cfg80211_chan_def *chandef); 
bool iwl_mvm_mac_add_interface_common(struct iwl_mvm *mvm,

				      struct ieee80211_hw *hw,

				      struct ieee80211_vif *vif, int *ret);

bool iwl_mvm_mac_remove_interface_common(struct ieee80211_hw *hw,

					 struct ieee80211_vif *vif);

void iwl_mvm_set_fw_basic_rates(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

				__le32 *cck_rates, __le32 *ofdm_rates);

void iwl_mvm_set_fw_protection_flags(struct iwl_mvm *mvm,

drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+2 −2
Original line number Diff line number Diff line
@@ -2256,7 +2256,7 @@ int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
	return 0;

}



static void iwl_mvm_free_bcast_sta_queues(struct iwl_mvm *mvm,

void iwl_mvm_free_bcast_sta_queues(struct iwl_mvm *mvm,

				   struct ieee80211_vif *vif)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

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

+2 −0
Original line number Diff line number Diff line
@@ -510,6 +510,8 @@ int iwl_mvm_add_aux_sta(struct iwl_mvm *mvm, u32 lmac_id); 
int iwl_mvm_rm_aux_sta(struct iwl_mvm *mvm);



int iwl_mvm_alloc_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);

void iwl_mvm_free_bcast_sta_queues(struct iwl_mvm *mvm,

				   struct ieee80211_vif *vif);

int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);

int iwl_mvm_add_p2p_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);

int iwl_mvm_send_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);