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 <quic_bqiang@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://patch.msgid.link/20240830073420.5790-2-quic_bqiang@quicinc.com

diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index 03187df26000c6ef19f79378022cfbf887b5673e..325b930aaf0652ff781074e532941075057f587f 100644 (file)
--- 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",