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

Commit d197358b authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: mvm: rename p2p-specific sta functions to include p2p in the names 



The iwl_mvm_add_bcast_sta() and the iwl_mvm_rm_bcast_sta() functions
are only called in P2P flows.  Add _p2p_ to the function names to make
this explicit.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -1428,7 +1428,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 
		if (ret)

			goto out_unref_phy;



		ret = iwl_mvm_add_bcast_sta(mvm, vif);

		ret = iwl_mvm_add_p2p_bcast_sta(mvm, vif);

		if (ret)

			goto out_unbind;
@@ -1558,7 +1558,7 @@ static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw, 


	if (vif->type == NL80211_IFTYPE_P2P_DEVICE) {

		mvm->p2p_device_vif = NULL;

		iwl_mvm_rm_bcast_sta(mvm, vif);

		iwl_mvm_rm_p2p_bcast_sta(mvm, vif);

		iwl_mvm_binding_remove_vif(mvm, vif);

		iwl_mvm_phy_ctxt_unref(mvm, mvmvif->phy_ctxt);

		mvmvif->phy_ctxt = NULL;

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

+2 −2
Original line number Diff line number Diff line
@@ -2106,7 +2106,7 @@ int iwl_mvm_alloc_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
 * @mvm: the mvm component

 * @vif: the interface to which the broadcast station is added

 * @bsta: the broadcast station to add. */

int iwl_mvm_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)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct iwl_mvm_int_sta *bsta = &mvmvif->bcast_sta;
@@ -2137,7 +2137,7 @@ void iwl_mvm_dealloc_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
 * Send the FW a request to remove the station from it's internal data

 * structures, and in addition remove it from the local data structure.

 */

int iwl_mvm_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)

int iwl_mvm_rm_p2p_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)

{

	int ret;

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

+2 −2
Original line number Diff line number Diff line
@@ -533,9 +533,9 @@ void iwl_mvm_del_aux_sta(struct iwl_mvm *mvm); 


int iwl_mvm_alloc_bcast_sta(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_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);

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

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

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

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

int iwl_mvm_allocate_int_sta(struct iwl_mvm *mvm,