update

devices/qualcommax_ipq60xx/.config

@@ -3,11 +3,3 @@ CONFIG_TARGET_qualcommax=y
 CONFIG_TARGET_qualcommax_ipq60xx=y
 CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_ALL_PROFILES=y
-
-CONFIG_PACKAGE_kmod-qca-nss-drv-ipsecmgr=n
-CONFIG_PACKAGE_kmod-qca-nss-drv-ovpn-mgr=n
-CONFIG_PACKAGE_kmod-qca-nss-drv-ovpn-link=n
-CONFIG_PACKAGE_kmod-qca-nss-drv-match=n
-CONFIG_PACKAGE_kmod-qca-nss-drv-map-t=n
-CONFIG_PACKAGE_kmod-qca-nss-drv-tunipip6=n
-CONFIG_PACKAGE_kmod-qca-nss-drv-netlink=n

devices/qualcommax_ipq60xx/diy.sh

@@ -4,16 +4,29 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-rm -rf package/boot package/kernel/qca* package/firmware/ipq-wifi target/linux/qualcommax target/linux/generic package/devel/perf
+rm -rf package/boot package/firmware/ipq-wifi target/linux/qualcommax target/linux/generic package/kernel package/firmware/ath11k-firmware
 
-git_clone_path master https://github.com/coolsnowwolf/lede target/linux/qualcommax target/linux/generic package/boot package/qca package/firmware/ipq-wifi
+git_clone_path k6.12-nss https://github.com/LiBwrt/openwrt-6.x target/linux/qualcommax target/linux/generic package/kernel package/boot package/firmware/ipq-wifi package/firmware/ath11k-firmware
 
-wget -N https://github.com/coolsnowwolf/lede/raw/master/include/kernel-6.6 -P include/
+wget -N https://github.com/openwrt/openwrt/raw/refs/heads/main/include/kernel-version.mk -P include/
+wget -N https://github.com/openwrt/openwrt/raw/refs/heads/main/include/target.mk -P include/
+wget -N https://github.com/LiBwrt/openwrt-6.x/raw/refs/heads/k6.12-nss/include/image-commands.mk -P include/
+wget -N https://github.com/LiBwrt/openwrt-6.x/raw/refs/heads/k6.12-nss/scripts/tplink-mkimage-2022.py -P scripts/
+wget -N https://github.com/LiBwrt/openwrt-6.x/raw/refs/heads/k6.12-nss/config/Config-ipq.in -P config/
+wget -N https://github.com/LiBwrt/openwrt-6.x/raw/refs/heads/k6.12-nss/Config.in -P ./
 
-sed -i -e "s/wpad-openssl/wpad-basic-mbedtls/" \
-	   -e "/KERNEL_TESTING_PATCHVER/d" \
-	   -e "s/KERNEL_PATCHVER:=6.12/KERNEL_PATCHVER:=6.6/" \
-target/linux/qualcommax/Makefile
+sed -i "s/DEFAULT_PACKAGES:=/DEFAULT_PACKAGES:=luci-app-advancedplus luci-app-firewall luci-app-package-manager luci-app-upnp luci-app-syscontrol luci-proto-wireguard \
+luci-app-wizard luci-base luci-compat luci-lib-ipkg luci-lib-fs luci-app-log-viewer \
+coremark wget-ssl curl autocore htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash openssh-sftp-server block-mount resolveip ds-lite swconfig luci-app-fan luci-app-filemanager /" include/target.mk
+sed -i "s/procd-ujail//" include/target.mk
 
-sed -i "/ECM_INTERFACE_MAP_T_ENABLE/d"  package/qca/qca-nss-ecm/Makefile
+chmod +x scripts/tplink-mkimage-2022.py
 
+git clone https://github.com/qosmio/nss-packages.git package/nss-packages
+git clone https://github.com/qosmio/sqm-scripts-nss.git package/sqm-scripts-nss
+
+sed -i "/ECM_INTERFACE_RAWIP_ENABLE/d"  package/nss-packages/qca-nss-ecm/Makefile
+
+rm -rf package/feeds/kiddin9/{xtables-wgobfs,shortcut-fe} package/devel/perf package/feeds/packages/{ovpn-dco,xr_usb_serial_common,openvswitch,xtables-addons}
+
+sed -i "s/luci uboot-envtools wpad-openssl/luci uboot-envtools wpad-mbedtls/" target/linux/qualcommax/Makefile

devices/qualcommax_ipq60xx/patches/fix.patch

@@ -1,11 +1,37 @@
---- a/package/kernel/linux/modules/netfilter.mk
-+++ b/package/kernel/linux/modules/netfilter.mk
-@@ -330,7 +330,7 @@ define KernelPackage/ipt-ipopt
-   KCONFIG:=$(KCONFIG_IPT_IPOPT)
-   FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).ko)
-   AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_IPOPT-m)))
--  $(call AddDepends/ipt)
-+  $(call AddDepends/ipt,+kmod-nf-conntrack)
- endef
- 
- define KernelPackage/ipt-ipopt/description
+--- a/target/linux/qualcommax/image/ipq60xx.mk
++++ b/target/linux/qualcommax/image/ipq60xx.mk
+@@ -312,7 +312,7 @@ define Device/jdcloud_re-ss-01
+ 	$(call Device/FitImage)
+ 	$(call Device/EmmcImage)
+ 	DEVICE_VENDOR := JDCloud
+-	DEVICE_MODEL := RE-SS-01
++	DEVICE_MODEL := AX1800 Pro
+ 	KERNEL_SIZE := 6144k
+ 	BLOCKSIZE := 128k
+ 	SOC := ipq6000
+@@ -326,7 +326,7 @@ define Device/jdcloud_re-cs-02
+ 	$(call Device/FitImage)
+ 	$(call Device/EmmcImage)
+ 	DEVICE_VENDOR := JDCloud
+-	DEVICE_MODEL := RE-CS-02
++	DEVICE_MODEL := AX6600
+ 	KERNEL_SIZE := 6144k
+ 	BLOCKSIZE := 128k
+ 	SOC := ipq6010
+diff --git a/target/linux/qualcommax/patches-6.12/999-fix-netdev-cacheline-size.patch b/target/linux/qualcommax/patches-6.12/999-fix-netdev-cacheline-size.patch
+new file mode 100644
+index 00000000000000..1481f8844bf45e
+--- /dev/null
++++ b/target/linux/qualcommax/patches-6.12/999-fix-netdev-cacheline-size.patch
+@@ -0,0 +1,11 @@
++--- a/net/core/dev.c
+++++ b/net/core/dev.c
++@@ -12060,7 +12060,7 @@ static void __init net_dev_struct_check(void)
++ #ifdef CONFIG_NET_XGRESS
++ 	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, tcx_egress);
++ #endif
++-	CACHELINE_ASSERT_GROUP_SIZE(struct net_device, net_device_read_tx, 160);
+++	CACHELINE_ASSERT_GROUP_SIZE(struct net_device, net_device_read_tx, 192);
++ 
++ 	/* TXRX read-mostly hotpath */
++ 	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, lstats);

devices/qualcommax_ipq60xx/patches/zn-m2.patch

@@ -1,34 +0,0 @@
---- a/target/linux/qualcommax/image/ipq60xx.mk
-+++ b/target/linux/qualcommax/image/ipq60xx.mk
-@@ -10,6 +10,8 @@ define Device/cmiot_ax18
- 	$(call Device/UbiFit)
- 	DEVICE_VENDOR := CMIOT
- 	DEVICE_MODEL := AX18
-+	DEVICE_ALT0_VENDOR := ZN
-+	DEVICE_ALT0_MODEL := M2
- 	BLOCKSIZE := 128k
- 	PAGESIZE := 2048
- 	DEVICE_DTS_CONFIG := config@cp03-c1
-@@ -127,7 +129,9 @@ define Device/xiaomi_rm1800
- 	$(call Device/FitImage)
- 	$(call Device/UbiFit)
- 	DEVICE_VENDOR := Xiaomi
--	DEVICE_MODEL := RM1800 (AX5)
-+	DEVICE_MODEL := AX1800
-+	DEVICE_ALT0_VENDOR := Redmi
-+	DEVICE_ALT0_MODEL := AX5
- 	BLOCKSIZE := 128k
- 	PAGESIZE := 2048
- 	SOC := ipq6000
-diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-ax18.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-ax18.dts
-index e887ff87a..b539d8dbb 100644
---- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-ax18.dts
-+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-ax18.dts
-@@ -213,6 +213,6 @@
- };
- 
- &wifi {
--	status = "disabled";
-+	status = "okay";
- 	qcom,ath11k-fw-memory-mode = <2>;
- };