diff mbox series

[O,07/21] UBUNTU: SAUCE: Revert "wifi: ath11k: restore country code during resume"

Message ID 20240903084010.3746280-8-juerg.haefliger@canonical.com
State New
Headers show
Series x13s: Fix various minor issues and add Venus support | expand

Commit Message

Juerg Haefliger Sept. 3, 2024, 8:39 a.m. UTC 
From: Baochen Qiang <quic_bqiang@quicinc.com>

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 <quic_bqiang@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Link: https://lore.kernel.org/r/20240830073420.5790-2-quic_bqiang@quicinc.com
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
(cherry picked from commit d3e154d7776ba57ab679fb816fb87b627fba21c9 linux-next)
Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
---
 drivers/net/wireless/ath/ath11k/core.c | 10 ----------
 1 file changed, 10 deletions(-)
diff mbox series

Patch

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",