diff options
| author | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 | 
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 | 
| commit | 1ac731c529cd4d6adbce134754b51ff7d822b145 (patch) | |
| tree | 143ab3f35ca5f3b69f583c84e6964b17139c2ec1 /drivers/net/wireless/ath/ath11k/dp.c | |
| parent | 07b4c950f27bef0362dc6ad7ee713aab61d58149 (diff) | |
| parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.6 merge window.
Diffstat (limited to 'drivers/net/wireless/ath/ath11k/dp.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath11k/dp.c | 4 | 
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath11k/dp.c b/drivers/net/wireless/ath/ath11k/dp.c index f5156a7fbdd7..d070bcb3fe24 100644 --- a/drivers/net/wireless/ath/ath11k/dp.c +++ b/drivers/net/wireless/ath/ath11k/dp.c @@ -36,6 +36,7 @@ void ath11k_dp_peer_cleanup(struct ath11k *ar, int vdev_id, const u8 *addr)  	}  	ath11k_peer_rx_tid_cleanup(ar, peer); +	peer->dp_setup_done = false;  	crypto_free_shash(peer->tfm_mmic);  	spin_unlock_bh(&ab->base_lock);  } @@ -72,7 +73,8 @@ int ath11k_dp_peer_setup(struct ath11k *ar, int vdev_id, const u8 *addr)  	ret = ath11k_peer_rx_frag_setup(ar, addr, vdev_id);  	if (ret) {  		ath11k_warn(ab, "failed to setup rx defrag context\n"); -		return ret; +		tid--; +		goto peer_clean;  	}  	/* TODO: Setup other peer specific resource used in data path */  |