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

Commit 712b24ad authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: clean up AUX station handling 



The auxiliary station is being handled using the internal
station helper functions, clean that up and make the helpers
static.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -886,7 +886,7 @@ static void iwl_mvm_mac_stop(struct ieee80211_hw *hw) 
	/* async_handlers_list is empty and will stay empty: HW is stopped */



	/* the fw is stopped, the aux sta is dead: clean up driver state */

	iwl_mvm_dealloc_int_sta(mvm, &mvm->aux_sta);

	iwl_mvm_del_aux_sta(mvm);



	mutex_unlock(&mvm->mutex);

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

+12 −3
Original line number Diff line number Diff line
@@ -464,7 +464,8 @@ int iwl_mvm_rm_sta_id(struct iwl_mvm *mvm, 
	return ret;

}



int iwl_mvm_allocate_int_sta(struct iwl_mvm *mvm, struct iwl_mvm_int_sta *sta,

static int iwl_mvm_allocate_int_sta(struct iwl_mvm *mvm,

				    struct iwl_mvm_int_sta *sta,

				    u32 qmask, enum nl80211_iftype iftype)

{

	if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) {
@@ -480,7 +481,8 @@ int iwl_mvm_allocate_int_sta(struct iwl_mvm *mvm, struct iwl_mvm_int_sta *sta, 
	return 0;

}



void iwl_mvm_dealloc_int_sta(struct iwl_mvm *mvm, struct iwl_mvm_int_sta *sta)

static void iwl_mvm_dealloc_int_sta(struct iwl_mvm *mvm,

				    struct iwl_mvm_int_sta *sta)

{

	RCU_INIT_POINTER(mvm->fw_id_to_mac_id[sta->sta_id], NULL);

	memset(sta, 0, sizeof(struct iwl_mvm_int_sta));
@@ -550,6 +552,13 @@ int iwl_mvm_add_aux_sta(struct iwl_mvm *mvm) 
	return ret;

}



void iwl_mvm_del_aux_sta(struct iwl_mvm *mvm)

{

	lockdep_assert_held(&mvm->mutex);



	iwl_mvm_dealloc_int_sta(mvm, &mvm->aux_sta);

}



/*

 * Send the add station command for the vif's broadcast station.

 * Assumes that the station was already allocated.

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

+1 −4
Original line number Diff line number Diff line
@@ -389,10 +389,7 @@ int iwl_mvm_sta_tx_agg_flush(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
			    struct ieee80211_sta *sta, u16 tid);



int iwl_mvm_add_aux_sta(struct iwl_mvm *mvm);

int iwl_mvm_allocate_int_sta(struct iwl_mvm *mvm, struct iwl_mvm_int_sta *sta,

			     u32 qmask, enum nl80211_iftype iftype);

void iwl_mvm_dealloc_int_sta(struct iwl_mvm *mvm,

			     struct iwl_mvm_int_sta *sta);

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);