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

Commit e82f57c8 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Kalle Valo
Browse files

ath10k: htt_tx: move lock into id_get function 



This is only code refactoring as all call sites of
ath10k_htt_tx_alloc_msdu_id() take the same lock it can be moved into the
id_get function and the assertion dropped.

Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 619c9700

drivers/net/wireless/ath/ath10k/htt_tx.c

+2 −8
Original line number Diff line number Diff line
@@ -208,10 +208,10 @@ int ath10k_htt_tx_alloc_msdu_id(struct ath10k_htt *htt, struct sk_buff *skb) 
	struct ath10k *ar = htt->ar;

	int ret;



	lockdep_assert_held(&htt->tx_lock);



	spin_lock_bh(&htt->tx_lock);

	ret = idr_alloc(&htt->pending_tx, skb, 0,

			htt->max_num_pending_tx, GFP_ATOMIC);

	spin_unlock_bh(&htt->tx_lock);



	ath10k_dbg(ar, ATH10K_DBG_HTT, "htt tx alloc msdu_id %d\n", ret);
@@ -1077,9 +1077,7 @@ int ath10k_htt_mgmt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) 
	len += sizeof(cmd->hdr);

	len += sizeof(cmd->mgmt_tx);



	spin_lock_bh(&htt->tx_lock);

	res = ath10k_htt_tx_alloc_msdu_id(htt, msdu);

	spin_unlock_bh(&htt->tx_lock);

	if (res < 0)

		goto err;
@@ -1161,9 +1159,7 @@ static int ath10k_htt_tx_32(struct ath10k_htt *htt, 
	struct htt_msdu_ext_desc *ext_desc = NULL;

	struct htt_msdu_ext_desc *ext_desc_t = NULL;



	spin_lock_bh(&htt->tx_lock);

	res = ath10k_htt_tx_alloc_msdu_id(htt, msdu);

	spin_unlock_bh(&htt->tx_lock);

	if (res < 0)

		goto err;
@@ -1363,9 +1359,7 @@ static int ath10k_htt_tx_64(struct ath10k_htt *htt, 
	struct htt_msdu_ext_desc_64 *ext_desc = NULL;

	struct htt_msdu_ext_desc_64 *ext_desc_t = NULL;



	spin_lock_bh(&htt->tx_lock);

	res = ath10k_htt_tx_alloc_msdu_id(htt, msdu);

	spin_unlock_bh(&htt->tx_lock);

	if (res < 0)

		goto err;