We got report that regdomain is not correct after hibernation, see details in patch 2. To fix it, host needs to restore country code to firmware using ath11k_wmi_send_set_current_country_cmd(). There are several places where it is called and all of them share the same code snippet. So refactor them to make code clean, this is done in the first patch. Actual fix comes in the second patch. Baochen Qiang (2): wifi: ath11k: refactor setting country code logic wifi: ath11k: restore country code during resume drivers/net/wireless/ath/ath11k/core.c | 29 ++++++++++++++++---------- drivers/net/wireless/ath/ath11k/mac.c | 13 +++--------- drivers/net/wireless/ath/ath11k/reg.c | 14 +++++++++---- drivers/net/wireless/ath/ath11k/reg.h | 4 ++-- 4 files changed, 33 insertions(+), 27 deletions(-) base-commit: d11f74006da48efd32f6304ef8fcec5894171641 -- 2.25.1