xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ath: add support for special 0x0 regulatory domain"

Browse Source 
commit 1ec7ed5163c70a0d040150d2279f932c7e7c143f upstream.

This reverts commit 2dc016599c.

Users are reporting regressions in regulatory domain detection and
channel availability.

The problem this was trying to resolve was fixed in firmware anyway:

    QCA6174 hw3.0: sdio-4.4.1: add firmware.bin_WLAN.RMH.4.4.1-00042
    4d382787f0

Link: https://bbs.archlinux.org/viewtopic.php?id=254535
Link: http://lists.infradead.org/pipermail/ath10k/2020-April/014871.html
Link: http://lists.infradead.org/pipermail/ath10k/2020-May/015152.html
Link: https://lore.kernel.org/all/1c160dfb-6ccc-b4d6-76f6-4364e0adb6dd@reox.at/
Fixes: 2dc016599c ("ath: add support for special 0x0 regulatory domain")
Cc: <stable@vger.kernel.org>
Cc: Wen Gong <wgong@codeaurora.org>
Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20200527165718.129307-1-briannorris@chromium.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Brian Norris
2022-02-25 11:44:32 +02:00
committed by Greg Kroah-Hartman
parent c971e6a1c8
commit 87f7ed7c36
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/ath/regd.c
View File

@@ -666,14 +666,14 @@ ath_regd_init_wiphy(struct ath_regulatory *reg,
/* /*
* Some users have reported their EEPROM programmed with * Some users have reported their EEPROM programmed with
* 0x8000 or 0x0 set, this is not a supported regulatory * 0x8000 set, this is not a supported regulatory domain
* domain but since we have more than one user with it we * but since we have more than one user with it we need
* need a solution for them. We default to 0x64, which is * a solution for them. We default to 0x64, which is the
* the default Atheros world regulatory domain. * default Atheros world regulatory domain.
*/ */
static void ath_regd_sanitize(struct ath_regulatory *reg) static void ath_regd_sanitize(struct ath_regulatory *reg)
{ {
if (reg->current_rd != COUNTRY_ERD_FLAG && reg->current_rd != 0) if (reg->current_rd != COUNTRY_ERD_FLAG)
return; return;
printk(KERN_DEBUG "ath: EEPROM regdomain sanitized\n"); printk(KERN_DEBUG "ath: EEPROM regdomain sanitized\n");
reg->current_rd = 0x64; reg->current_rd = 0x64;