Commit 23babdf0 authored by Gregory Greenman's avatar Gregory Greenman Committed by Johannes Berg
Browse files

iwlwifi: mvm: add a wrapper around rs_tx_status to handle locks 



iwl_mvm_rs_tx_status can be called from two places in the code, but the
mutex is taken only on one of the calls. Split it into a wrapper taking
locks and an internal __iwl_mvm_rs_tx_status function.

Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3c514bf8

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

+19 −9
Original line number Diff line number Diff line
@@ -1218,8 +1218,10 @@ void iwl_mvm_rs_init_wk(struct work_struct *wk) 
	rcu_read_unlock();

}



void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,

			  int tid, struct ieee80211_tx_info *info, bool ndp)

static void __iwl_mvm_rs_tx_status(struct iwl_mvm *mvm,

				   struct ieee80211_sta *sta,

				   int tid, struct ieee80211_tx_info *info,

				   bool ndp)

{

	int legacy_success;

	int retries;
@@ -1451,6 +1453,21 @@ done: 
		rs_rate_scale_perform(mvm, sta, lq_sta, tid, ndp);

}



void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,

			  int tid, struct ieee80211_tx_info *info, bool ndp)

{

	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);



	/* If it's locked we are in middle of init flow

	 * just wait for next tx status to update the lq_sta data

	 */

	if (!mutex_trylock(&mvmsta->lq_sta.rs_drv.mutex))

		return;



	__iwl_mvm_rs_tx_status(mvm, sta, tid, info, ndp);

	mutex_unlock(&mvmsta->lq_sta.rs_drv.mutex);

}



/*

 * mac80211 sends us Tx status

 */
@@ -1472,15 +1489,8 @@ static void rs_drv_mac80211_tx_status(void *mvm_r, 
	    info->flags & IEEE80211_TX_CTL_NO_ACK)

		return;



	/* If it's locked we are in middle of init flow

	 * just wait for next tx status to update the lq_sta data

	 */

	if (!mutex_trylock(&mvmsta->lq_sta.rs_drv.mutex))

		return;



	iwl_mvm_rs_tx_status(mvm, sta, rs_get_tid(hdr), info,

			     ieee80211_is_qos_nullfunc(hdr->frame_control));

	mutex_unlock(&mvmsta->lq_sta.rs_drv.mutex);

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE