Skip to content

Commit 289e4c7

Browse files
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: (27 commits) dnsmasq: bump to v2.87 mt76: add mt7922 firmware ath10k-ct: update to 2022-05-13 mediatek: add LED support for Xiaomi Redmi Router AX6000 mediatek: fix mt7981 clk clock support mediatek: add filogic 820 (MT7981) subtarget support kernel: modules: package Marvell gigE PHY driver uboot-mediatek: optimize MMC erase tools: update versions (coolsnowwolf#10444) kernel: bump 5.15 to 5.15.79 (coolsnowwolf#10441) kernel: bump 5.10 to 5.10.155 (coolsnowwolf#10443) libnetfilter-conntrack: bump to 1.0.9 (coolsnowwolf#10442) ipq60xx: sync patches from upstream Update README.md netsupport.mk: fix rxrpc dependence ipq6000: add usb3 DT description kernel: bump 6.0 to 6.0.9 (coolsnowwolf#10429) ipq60xx: add Qihoo 360v6 wireless support mac80211/ath10k: add sdio chip support mt76: backport changed IEEE80211_MAX_AMPDU_BUF define ...
2 parents adc33af + c5b0c71 commit 289e4c7

File tree

113 files changed

+4474
-710
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+4474
-710
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Op固件技术研究群 ,号码 891659613 ,加群链接:[点击加入](https
99
2. TG 讨论群: OP 编译官方大群 ,加群链接:[点击加入](https://t.me/JhKgAA6Hx1 "OP 编译官方大群")
1010
3. Rockchip RK3568 预编译固件发布 Release 下载更新地址 (包括 H68K ):<https://github.com/coolsnowwolf/lede/releases/tag/20220716>
1111

12-
<img src="https://github.com/coolsnowwolf/lede/blob/master/doc/h68k.jpg?raw=true" width=600 />
12+
<a href ="https://item.taobao.com/item.htm?spm=a230r.1.14.26.4bb55247bX9SiV&id=692981063139&ns=1&abbucket=15#detail"><img src="https://github.com/coolsnowwolf/lede/blob/master/doc/h68k.jpg?raw=true" width=600 /></a>
1313

1414
## 注意
1515

doc/h68k.jpg

7.67 KB
Loading

include/kernel-5.10

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.10 = .154
2-
LINUX_KERNEL_HASH-5.10.154 = c6ae3d4da4324933160260d0f092a40cd27f9ed03449380790afbe6ce91ee688
1+
LINUX_VERSION-5.10 = .155
2+
LINUX_KERNEL_HASH-5.10.155 = f1b027526c58e7bd127f35b17736e4a6c865866b9048898f05c5358d4d52d4f3

include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .78
2-
LINUX_KERNEL_HASH-5.15.78 = 0db99f7347a38c27b8c155f3c9c8b260011aea0a4ded85ee95e6095b1e69a499
1+
LINUX_VERSION-5.15 = .79
2+
LINUX_KERNEL_HASH-5.15.79 = cba39031dbc0eed0785b8afdc8c58cf23df83e47001b2354fa44486ae699c154

include/kernel-6.0

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.0 = .8
2-
LINUX_KERNEL_HASH-6.0.8 = 0de4f83996951c6faf9b2225db4f645882c47b1a09198190f97bd46e5f5fa257
1+
LINUX_VERSION-6.0 = .9
2+
LINUX_KERNEL_HASH-6.0.9 = 6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7

package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
+emmc_read_recovery=mmc dev 0 0 ; part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_read_vol
199199
+mmc_write_production=if test "$bootedfrom" = "SD" ; then run sdmmc_write_production ; else run emmc_write_production ; fi
200200
+mmc_write_recovery=if test "$bootedfrom" = "SD" ; run sdmmc_write_recovery ; else run emmc_write_recovery ; fi
201-
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$part_size && mmc write $loadaddr 0x$part_addr 0x$image_size
201+
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
202202
+mmc_read_vol=mmc read $loadaddr $part_addr 0x8 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size && setexpr filesize $image_size * 0x200
203203
+reset_factory=eraseenv && reset
204204
+sdmmc_read_emmc_hdr=mmc dev 1 && mmc read $loadaddr 0x1ff8 0x8

package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
+emmc_write_recovery=mmc dev 0 0 ; iminfo $loadaddr && part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_write_vol
197197
+emmc_read_production=mmc dev 0 0 ; part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_read_vol
198198
+emmc_read_recovery=mmc dev 0 0 ; part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_read_vol
199-
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$part_size && mmc write $loadaddr 0x$part_addr 0x$image_size
199+
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
200200
+mmc_read_vol=mmc read $loadaddr $part_addr 0x8 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size && setexpr filesize $image_size * 0x200
201201
+reset_factory=eraseenv && reset
202202
+_init_env=setenv _init_env ; saveenv ; saveenv

package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
+emmc_write_hdr=mmc dev 0 0 && mmc erase 0x0 0x40 && mmc write $loadaddr 0x0 0x40
215215
+emmc_write_production=mmc dev 0 && part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_write_vol
216216
+emmc_write_recovery=mmc dev 0 && part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_write_vol
217-
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$part_size && mmc write $loadaddr 0x$part_addr 0x$image_size
217+
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
218218
+mmc_read_vol=mmc read $loadaddr $part_addr 0x8 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size && setexpr filesize $image_size * 0x200
219219
+part_default=production
220220
+part_recovery=recovery
@@ -444,7 +444,7 @@
444444
+emmc_write_fip=mmc dev 0 0 && mmc erase 0x1000 0x1000 && mmc write $loadaddr 0x1000 0x1000 && mmc erase 0x2000 0x800
445445
+emmc_read_production=mmc dev 0 && part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_read_vol
446446
+emmc_read_recovery=mmc dev 0 && part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_read_vol
447-
+mmc_write_vol=imszb $fileaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$part_size && mmc write $fileaddr 0x$part_addr 0x$image_size
447+
+mmc_write_vol=imszb $fileaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $fileaddr 0x$part_addr 0x$image_size
448448
+mmc_read_vol=mmc read $loadaddr $part_addr 0x8 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size
449449
+part_default=production
450450
+part_recovery=recovery

package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,7 @@
11391139
+boot_tftp_production=run boot_update_conf ; tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run sdmmc_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
11401140
+boot_tftp_recovery=run boot_update_conf ; tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run sdmmc_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
11411141
+boot_tftp=run boot_update_conf ; tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
1142-
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$part_size && mmc write $loadaddr 0x$part_addr 0x$image_size
1142+
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
11431143
+mmc_read_vol=mmc read $loadaddr $part_addr 0x8 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size && setexpr filesize $image_size * 0x200
11441144
+part_default=production
11451145
+part_recovery=recovery
@@ -1294,7 +1294,7 @@
12941294
+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
12951295
+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
12961296
+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic 3 && ubi write $loadaddr recovery $filesize
1297-
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$part_size && mmc write $loadaddr 0x$part_addr 0x$image_size
1297+
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
12981298
+emmc_init=mmc dev 0 && mmc bootbus 0 0 0 0 && run emmc_init_bl && run emmc_init_openwrt ; env default bootcmd ; saveenv ; saveenv
12991299
+emmc_init_bl=run ubi_read_emmc_install && setenv fileaddr $loadaddr && run emmc_write_bl2 && setexpr fileaddr $loadaddr + 0x100000 && run emmc_write_fip && setexpr fileaddr $loadaddr + 0x500000 && run emmc_write_hdr
13001300
+emmc_init_openwrt=run ubi_read_recovery && iminfo $loadaddr && run emmc_write_recovery ; run ubi_read_production && iminfo $loadaddr && run emmc_write_production
@@ -1351,7 +1351,7 @@
13511351
+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run emmc_write_bl2
13521352
+boot_tftp=run boot_update_conf ; tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
13531353
+boot_update_conf=if nand info ; then setenv bootconf config-mt7986a-bananapi-bpi-r3-emmc-snand ; else setenv bootconf config-mt7986a-bananapi-bpi-r3-emmc-nor ; fi
1354-
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$part_size && mmc write $loadaddr 0x$part_addr 0x$image_size
1354+
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
13551355
+mmc_read_vol=mmc read $loadaddr $part_addr 0x8 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size && setexpr filesize $image_size * 0x200
13561356
+part_default=production
13571357
+part_recovery=recovery

package/kernel/ath10k-ct/Makefile

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
88

99
PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git
1010
PKG_SOURCE_PROTO:=git
11-
PKG_SOURCE_DATE:=2021-11-28
12-
PKG_SOURCE_VERSION:=dc350bbf41d987c5b2db54405bcc9ef3cd66d5db
13-
PKG_MIRROR_HASH:=92422485c7b92be840a40bf8d157bb6731d14d3811907b6cb4e4cfab0777b60d
11+
PKG_SOURCE_DATE:=2022-05-13
12+
PKG_SOURCE_VERSION:=f808496fcc6b1f68942914117aebf8b3f8d52bb3
13+
PKG_MIRROR_HASH:=39527b3408696594eda5579521a9fb798417be4dda73fa08e8b3a8c7b0d3f3d9
1414

1515
# Build the 5.15 ath10k-ct driver version.
1616
# Probably this should match as closely as
@@ -33,7 +33,8 @@ define KernelPackage/ath10k-ct
3333
FILES:=\
3434
$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_pci.ko \
3535
$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_core.ko
36-
AUTOLOAD:=$(call AutoProbe,ath10k_pci)
36+
AUTOLOAD:=$(call AutoProbe,ath10k_core ath10k_pci)
37+
MODPARAMS.ath10k_core:=frame_mode=2
3738
PROVIDES:=kmod-ath10k
3839
VARIANT:=regular
3940
endef

package/kernel/ath10k-ct/patches/120-ath10k-fetch-calibration-data-via-nvmem-subsystem.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Signed-off-by: Christian Lamparter <[email protected]>
3434
#include <asm/byteorder.h>
3535
#include <linux/ctype.h>
3636

37-
@@ -988,7 +989,8 @@ static int ath10k_core_get_board_id_from
37+
@@ -1005,7 +1006,8 @@ static int ath10k_core_get_board_id_from
3838
}
3939

4040
if (ar->cal_mode == ATH10K_PRE_CAL_MODE_DT ||
@@ -44,7 +44,7 @@ Signed-off-by: Christian Lamparter <[email protected]>
4444
bmi_board_id_param = BMI_PARAM_GET_FLASH_BOARD_ID;
4545
else
4646
bmi_board_id_param = BMI_PARAM_GET_EEPROM_BOARD_ID;
47-
@@ -2087,7 +2089,8 @@ static int ath10k_download_and_run_otp(s
47+
@@ -2115,7 +2117,8 @@ static int ath10k_download_and_run_otp(s
4848

4949
/* As of now pre-cal is valid for 10_4 variants */
5050
if (ar->cal_mode == ATH10K_PRE_CAL_MODE_DT ||
@@ -54,7 +54,7 @@ Signed-off-by: Christian Lamparter <[email protected]>
5454
bmi_otp_exe_param = BMI_PARAM_FLASH_SECTION_ALL;
5555

5656
ret = ath10k_bmi_execute(ar, address, bmi_otp_exe_param, &result);
57-
@@ -2221,6 +2224,39 @@ struct ath10k_bss_rom_ie {
57+
@@ -2249,6 +2252,39 @@ struct ath10k_bss_rom_ie {
5858
__le32 rom_len;
5959
} __packed;
6060

@@ -94,7 +94,7 @@ Signed-off-by: Christian Lamparter <[email protected]>
9494
int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name,
9595
struct ath10k_fw_file *fw_file)
9696
{
97-
@@ -2597,6 +2633,18 @@ static int ath10k_core_pre_cal_download(
97+
@@ -2625,6 +2661,18 @@ static int ath10k_core_pre_cal_download(
9898
{
9999
int ret;
100100

@@ -113,7 +113,7 @@ Signed-off-by: Christian Lamparter <[email protected]>
113113
ret = ath10k_download_cal_file(ar, ar->pre_cal_file);
114114
if (ret == 0) {
115115
ar->cal_mode = ATH10K_PRE_CAL_MODE_FILE;
116-
@@ -2663,6 +2711,18 @@ static int ath10k_download_cal_data(stru
116+
@@ -2691,6 +2739,18 @@ static int ath10k_download_cal_data(stru
117117
"pre cal download procedure failed, try cal file: %d\n",
118118
ret);
119119

package/kernel/ath10k-ct/patches/201-ath10k-add-LED-and-GPIO-controlling-support-for-various-chipsets.patch

+13-13
Original file line numberDiff line numberDiff line change
@@ -129,39 +129,39 @@ v13:
129129
.patch_load_addr = QCA988X_HW_2_0_PATCH_LOAD_ADDR,
130130
.uart_pin = 7,
131131
.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL,
132-
@@ -141,6 +143,7 @@ static const struct ath10k_hw_params ath
132+
@@ -143,6 +145,7 @@ static const struct ath10k_hw_params ath
133133
.dev_id = QCA9887_1_0_DEVICE_ID,
134134
.bus = ATH10K_BUS_PCI,
135135
.name = "qca9887 hw1.0",
136136
+ .led_pin = 1,
137137
.patch_load_addr = QCA9887_HW_1_0_PATCH_LOAD_ADDR,
138138
.uart_pin = 7,
139139
.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL,
140-
@@ -352,6 +355,7 @@ static const struct ath10k_hw_params ath
140+
@@ -360,6 +363,7 @@ static const struct ath10k_hw_params ath
141141
.dev_id = QCA99X0_2_0_DEVICE_ID,
142142
.bus = ATH10K_BUS_PCI,
143143
.name = "qca99x0 hw2.0",
144144
+ .led_pin = 17,
145145
.patch_load_addr = QCA99X0_HW_2_0_PATCH_LOAD_ADDR,
146146
.uart_pin = 7,
147147
.otp_exe_param = 0x00000700,
148-
@@ -393,6 +397,7 @@ static const struct ath10k_hw_params ath
148+
@@ -402,6 +406,7 @@ static const struct ath10k_hw_params ath
149149
.dev_id = QCA9984_1_0_DEVICE_ID,
150150
.bus = ATH10K_BUS_PCI,
151151
.name = "qca9984/qca9994 hw1.0",
152152
+ .led_pin = 17,
153153
.patch_load_addr = QCA9984_HW_1_0_PATCH_LOAD_ADDR,
154154
.uart_pin = 7,
155155
.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,
156-
@@ -441,6 +446,7 @@ static const struct ath10k_hw_params ath
156+
@@ -451,6 +456,7 @@ static const struct ath10k_hw_params ath
157157
.dev_id = QCA9888_2_0_DEVICE_ID,
158158
.bus = ATH10K_BUS_PCI,
159159
.name = "qca9888 hw2.0",
160160
+ .led_pin = 17,
161161
.patch_load_addr = QCA9888_HW_2_0_PATCH_LOAD_ADDR,
162162
.uart_pin = 7,
163163
.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,
164-
@@ -3942,6 +3948,10 @@ int ath10k_core_start(struct ath10k *ar,
164+
@@ -3977,6 +3983,10 @@ int ath10k_core_start(struct ath10k *ar,
165165
ath10k_wmi_check_apply_board_power_ctl_table(ar);
166166
}
167167

@@ -172,7 +172,7 @@ v13:
172172
return 0;
173173

174174
err_hif_stop:
175-
@@ -4203,9 +4213,18 @@ static void ath10k_core_register_work(st
175+
@@ -4238,9 +4248,18 @@ static void ath10k_core_register_work(st
176176
goto err_spectral_destroy;
177177
}
178178

@@ -191,7 +191,7 @@ v13:
191191
err_spectral_destroy:
192192
ath10k_spectral_destroy(ar);
193193
err_debug_destroy:
194-
@@ -4265,6 +4284,8 @@ void ath10k_core_unregister(struct ath10
194+
@@ -4300,6 +4319,8 @@ void ath10k_core_unregister(struct ath10
195195
if (!test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags))
196196
return;
197197

@@ -456,7 +456,7 @@ v13:
456456
static const struct wmi_peer_flags_map wmi_tlv_peer_flags_map = {
457457
--- a/ath10k-5.15/wmi.c
458458
+++ b/ath10k-5.15/wmi.c
459-
@@ -8409,6 +8409,49 @@ ath10k_wmi_op_gen_peer_set_param(struct
459+
@@ -8413,6 +8413,49 @@ ath10k_wmi_op_gen_peer_set_param(struct
460460
return skb;
461461
}
462462

@@ -506,7 +506,7 @@ v13:
506506
static struct sk_buff *
507507
ath10k_wmi_op_gen_set_psmode(struct ath10k *ar, u32 vdev_id,
508508
enum wmi_sta_ps_mode psmode)
509-
@@ -10240,6 +10283,9 @@ static const struct wmi_ops wmi_ops = {
509+
@@ -10244,6 +10287,9 @@ static const struct wmi_ops wmi_ops = {
510510
.fw_stats_fill = ath10k_wmi_main_op_fw_stats_fill,
511511
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
512512
.gen_echo = ath10k_wmi_op_gen_echo,
@@ -516,7 +516,7 @@ v13:
516516
/* .gen_bcn_tmpl not implemented */
517517
/* .gen_prb_tmpl not implemented */
518518
/* .gen_p2p_go_bcn_ie not implemented */
519-
@@ -10310,6 +10356,8 @@ static const struct wmi_ops wmi_10_1_ops
519+
@@ -10314,6 +10360,8 @@ static const struct wmi_ops wmi_10_1_ops
520520
.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,
521521
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
522522
.gen_echo = ath10k_wmi_op_gen_echo,
@@ -525,7 +525,7 @@ v13:
525525
/* .gen_bcn_tmpl not implemented */
526526
/* .gen_prb_tmpl not implemented */
527527
/* .gen_p2p_go_bcn_ie not implemented */
528-
@@ -10389,6 +10437,8 @@ static const struct wmi_ops wmi_10_2_ops
528+
@@ -10393,6 +10441,8 @@ static const struct wmi_ops wmi_10_2_ops
529529
.gen_delba_send = ath10k_wmi_op_gen_delba_send,
530530
.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,
531531
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
@@ -534,7 +534,7 @@ v13:
534534
/* .gen_pdev_enable_adaptive_cca not implemented */
535535
};
536536

537-
@@ -10460,6 +10510,8 @@ static const struct wmi_ops wmi_10_2_4_o
537+
@@ -10464,6 +10514,8 @@ static const struct wmi_ops wmi_10_2_4_o
538538
ath10k_wmi_op_gen_pdev_enable_adaptive_cca,
539539
.get_vdev_subtype = ath10k_wmi_10_2_4_op_get_vdev_subtype,
540540
.gen_bb_timing = ath10k_wmi_10_2_4_op_gen_bb_timing,
@@ -543,7 +543,7 @@ v13:
543543
/* .gen_bcn_tmpl not implemented */
544544
/* .gen_prb_tmpl not implemented */
545545
/* .gen_p2p_go_bcn_ie not implemented */
546-
@@ -10542,6 +10594,8 @@ static const struct wmi_ops wmi_10_4_ops
546+
@@ -10546,6 +10598,8 @@ static const struct wmi_ops wmi_10_4_ops
547547
.gen_pdev_bss_chan_info_req = ath10k_wmi_10_2_op_gen_pdev_bss_chan_info,
548548
.gen_echo = ath10k_wmi_op_gen_echo,
549549
.gen_pdev_get_tpc_config = ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config,

package/kernel/ath10k-ct/patches/202-ath10k-use-tpt-trigger-by-default.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Signed-off-by: Mathias Kresin <[email protected]>
4242
if (ret)
4343
--- a/ath10k-5.15/mac.c
4444
+++ b/ath10k-5.15/mac.c
45-
@@ -11521,7 +11521,7 @@ int ath10k_mac_register(struct ath10k *a
45+
@@ -11544,7 +11544,7 @@ int ath10k_mac_register(struct ath10k *a
4646
ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER;
4747

4848
#ifdef CPTCFG_MAC80211_LEDS

package/kernel/linux/modules/netdevices.mk

+34
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,40 @@ endef
244244
$(eval $(call KernelPackage,phy-bcm84881))
245245

246246

247+
define KernelPackage/phy-marvell
248+
SUBMENU:=$(NETWORK_DEVICES_MENU)
249+
TITLE:=Marvell Gigabit Ethernet PHY driver
250+
KCONFIG:=CONFIG_MARVELL_PHY
251+
DEPENDS:=+kmod-libphy
252+
FILES:=$(LINUX_DIR)/drivers/net/phy/marvell.ko
253+
AUTOLOAD:=$(call AutoLoad,18,marvell)
254+
endef
255+
256+
define KernelPackage/phy-marvell/description
257+
Supports Marvell Gigabit Ethernet PHYs:
258+
* 88E1101
259+
* 88E1112
260+
* 88E1111 (incl. Finisar variant)
261+
* 88E1118
262+
* 88E1121R
263+
* 88E1145
264+
* 88E1149R
265+
* 88E1240
266+
* 88E1318S
267+
* 88E1116R
268+
* 88E1510
269+
* 88E1540
270+
* 88E1545
271+
* 88E3016
272+
* 88E6341 family
273+
* 88E6390 family
274+
* 88E6393 family
275+
* 88E1340S
276+
* 88E1548P
277+
endef
278+
279+
$(eval $(call KernelPackage,phy-marvell))
280+
247281

248282
define KernelPackage/phy-realtek
249283
SUBMENU:=$(NETWORK_DEVICES_MENU)

package/kernel/linux/modules/netsupport.mk

+6-1
Original file line numberDiff line numberDiff line change
@@ -1137,6 +1137,12 @@ $(eval $(call KernelPackage,dnsresolver))
11371137
define KernelPackage/rxrpc
11381138
SUBMENU:=$(NETWORK_SUPPORT_MENU)
11391139
TITLE:=AF_RXRPC support
1140+
DEPENDS:= \
1141+
+kmod-crypto-manager \
1142+
+kmod-crypto-pcbc \
1143+
+kmod-crypto-fcrypt \
1144+
+kmod-udptunnel4 \
1145+
+IPV6:kmod-udptunnel6
11401146
HIDDEN:=1
11411147
KCONFIG:= \
11421148
CONFIG_AF_RXRPC \
@@ -1145,7 +1151,6 @@ define KernelPackage/rxrpc
11451151
FILES:= \
11461152
$(LINUX_DIR)/net/rxrpc/rxrpc.ko
11471153
AUTOLOAD:=$(call AutoLoad,30,rxrpc.ko)
1148-
DEPENDS:= +kmod-crypto-manager +kmod-crypto-pcbc +kmod-crypto-fcrypt
11491154
endef
11501155

11511156
define KernelPackage/rxrpc/description

0 commit comments

Comments
 (0)