aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaochen Qiang <[email protected]>2024-08-30 07:34:19 +0000
committerKalle Valo <[email protected]>2024-09-02 16:26:47 +0000
commitd3e154d7776ba57ab679fb816fb87b627fba21c9 (patch)
treee7bdadd8eebe5a067bd06e110ad05f7272392982
parentwifi: ath11k: fix NULL pointer dereference in ath11k_mac_get_eirp_power() (diff)
downloadkernel-d3e154d7776ba57ab679fb816fb87b627fba21c9.tar.gz
kernel-d3e154d7776ba57ab679fb816fb87b627fba21c9.zip
Revert "wifi: ath11k: restore country code during resume"
This reverts commit 7f0343b7b8710436c1e6355c71782d32ada47e0c. We are going to revert commit 166a490f59ac ("wifi: ath11k: support hibernation"), on which this commit depends. With that commit reverted, this one is not needed any more, so revert this commit first. Signed-off-by: Baochen Qiang <[email protected]> Acked-by: Jeff Johnson <[email protected]> Signed-off-by: Kalle Valo <[email protected]> Link: https://patch.msgid.link/[email protected]
-rw-r--r--drivers/net/wireless/ath/ath11k/core.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index 03187df26000..325b930aaf06 100644
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -1009,16 +1009,6 @@ int ath11k_core_resume(struct ath11k_base *ab)
return -ETIMEDOUT;
}
- if (ab->hw_params.current_cc_support &&
- ar->alpha2[0] != 0 && ar->alpha2[1] != 0) {
- ret = ath11k_reg_set_cc(ar);
- if (ret) {
- ath11k_warn(ab, "failed to set country code during resume: %d\n",
- ret);
- return ret;
- }
- }
-
ret = ath11k_dp_rx_pktlog_start(ab);
if (ret)
ath11k_warn(ab, "failed to start rx pktlog during resume: %d\n",