From: Thibaut VARÈNE Date: Fri, 2 Oct 2020 21:37:05 +0000 (+0200) Subject: ar71xx: mikrotik: bypass id check in __rb_get_wlan_data() X-Git-Tag: v18.06.9~7 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=ac56d253618c8c60794496518f2522863f24dedf ar71xx: mikrotik: bypass id check in __rb_get_wlan_data() The id parameter in __rb_get_wlan_data() was incorrectly used on the assumption that id "0" would always be tied to ath9k with RLE encoding and positive id (in fact, only id "1" was valid) would always be tied to ("external") ath10k with LZO encoding. Newer hardware revisions of supported devices prove this assumption to be invalid, with ath9k caldata being now wrapped in MAGIC_ERD and LZO compressed, so disable this check to allow newer hardware to correctly decode caldata for ath9k. Note: this patch assumes that ath9k caldata is never stored with the new "LZOR" encoding scheme found on some ath10k devices. Signed-off-by: Thibaut VARÈNE (cherry picked from commit 1c6990fe6d198718850b6a37998416cac69f6f53) [keep publishing ath10k caldata in sysfs: it's the way it's done on 18.06] Signed-off-by: Baptiste Jonglez Tested-by: Baptiste Jonglez [Mikrotik RB941-2nD r3] --- diff --git a/target/linux/ar71xx/files/arch/mips/ath79/routerboot.c b/target/linux/ar71xx/files/arch/mips/ath79/routerboot.c index 76776e1d84..945894f823 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/routerboot.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/routerboot.c @@ -206,10 +206,7 @@ __rb_get_wlan_data(u16 id) u8 *erd_data; u16 erd_len; - if (id == 0) - goto err_free; - - err = routerboot_find_tag(tag, tag_len, id, + err = routerboot_find_tag(tag, tag_len, 0x1, &erd_data, &erd_len); if (err) { pr_err("no ERD data found for id %u\n", id); @@ -224,9 +221,6 @@ __rb_get_wlan_data(u16 id) goto err_free; } } else { - if (id != 0) - goto err_free; - err = rle_decode((char *) tag, tag_len, buf, RB_ART_SIZE, &src_done, &dst_done); if (err) {