WIFI-14788 WF-189w/h add temperature control

1.Change the WiFi temperature threshold. 2.Use single antenna when temperature is too high. Signed-off-by: Justin.Guo <guoxijun@actiontec.com>
2025-10-29 09:32:34 +00:00 · 2025-07-08 11:25:52 +08:00
51 changed files with 17537 additions and 20807 deletions
--- a/feeds/hostapd/hostapd/Makefile
+++ b/feeds/hostapd/hostapd/Makefile
@@ -747,7 +747,6 @@ define Package/wpad/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wpad $(1)/usr/sbin/
 	$(LN) wpad $(1)/usr/sbin/hostapd
 	$(LN) wpad $(1)/usr/sbin/wpa_supplicant
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd_cli $(1)/usr/sbin/
 endef
 Package/wpad-basic/install = $(Package/wpad/install)
 Package/wpad-basic-openssl/install = $(Package/wpad/install)
--- a/feeds/ipq807x_v5.4/ath11k-wifi/Makefile
+++ b/feeds/ipq807x_v5.4/ath11k-wifi/Makefile
@@ -41,10 +41,8 @@ ALLWIFIBOARDS:= \
 	edgecore-oap102 \
 	edgecore-oap103 \
 	edgecore-eap104 \
-	emplus-wap380c \
 	emplus-wap385c \
 	emplus-wap386v2 \
-	emplus-wap581 \
 	liteon-wpx8324 \
 	indio-um-310ax-v1 \
 	indio-um-510axp-v1 \
@@ -66,7 +64,8 @@ ALLWIFIBOARDS:= \
 	yuncore-fap655 \
 	udaya-a6-id2 \
 	udaya-a6-od2 \
-	meshpp-s618
+	meshpp-s618 \
+	emplus-wap581

 ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ath11k-wifi-$(BOARD))

@@ -409,10 +408,8 @@ $(eval $(call generate-ath11k-wifi-package,edgecore-eap102,Edgecore EAP102))
 $(eval $(call generate-ath11k-wifi-package,edgecore-oap102,Edgecore OAP102))
 $(eval $(call generate-ath11k-wifi-package,edgecore-oap103,Edgecore OAP103))
 $(eval $(call generate-ath11k-wifi-package,edgecore-eap104,Edgecore EAP104))
-$(eval $(call generate-ath11k-wifi-package,emplus-wap380c,Emplus WAP380C))
 $(eval $(call generate-ath11k-wifi-package,emplus-wap385c,Emplus WAP385C))
 $(eval $(call generate-ath11k-wifi-package,emplus-wap386v2,Emplus WAP386 V2))
-$(eval $(call generate-ath11k-wifi-package,emplus-wap581,Emplus WAP581))
 $(eval $(call generate-ath11k-wifi-package,liteon-wpx8324,Liteon WPX8324))
 $(eval $(call generate-ath11k-wifi-package,indio-um-310ax-v1,Indio UM-310AX V1))
 $(eval $(call generate-ath11k-wifi-package,indio-um-510axp-v1,Indio UM-510AXP V1))
@@ -432,6 +429,7 @@ $(eval $(call generate-ath11k-wifi-package,yuncore-fap655,YunCore FAP655))
 $(eval $(call generate-ath11k-wifi-package,udaya-a6-id2,Udaya A6-ID2))
 $(eval $(call generate-ath11k-wifi-package,udaya-a6-od2,Udaya A6-OD2))
 $(eval $(call generate-ath11k-wifi-package,wallys-dr5018,Wallys DR5018))
+$(eval $(call generate-ath11k-wifi-package,emplus-wap581,emplus-wap581))

 $(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
 $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq5018))
--- a/feeds/ipq807x_v5.4/ath11k-wifi/board-emplus-wap380c.bin.IPQ8074
+++ b/feeds/ipq807x_v5.4/ath11k-wifi/board-emplus-wap380c.bin.IPQ8074
--- a/feeds/ipq807x_v5.4/ipq807x/base-files/etc/board.d/01_leds
+++ b/feeds/ipq807x_v5.4/ipq807x/base-files/etc/board.d/01_leds
@@ -20,12 +20,6 @@ edgecore,oap103)
        ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wifi2" "phy1tpt"
        ucidef_set_led_wlan "power" "POWER" "green:power" "default-on"
 	;;
-emplus,wap380c)
-	ucidef_set_led_default "power"  "POWER"  "ipq::led0" "on"
-	ucidef_set_led_netdev  "wan"    "WAN"    "ipq::led1" "eth0"
-	ucidef_set_led_wlan    "wlan2g" "WLAN2G" "ipq::led2" "phy1tpt"
-	ucidef_set_led_wlan    "wlan5g" "WLAN5G" "ipq::led3" "phy0tpt"
-	;;
 sonicfi,rap630w-311g|\
 sonicfi,rap650c|\
 cybertan,eww631-b1)
--- a/feeds/ipq807x_v5.4/ipq807x/base-files/etc/board.d/02_network
+++ b/feeds/ipq807x_v5.4/ipq807x/base-files/etc/board.d/02_network
@@ -12,7 +12,6 @@ qcom_setup_interfaces()
 	ucidef_add_switch_attr "switch0" "reset" "false"

 	case $board in
-	emplus,wap380c|\
 	tplink,ex227|\
 	tplink,ex447)
 		ucidef_set_interface_wan "eth0"
--- a/feeds/ipq807x_v5.4/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
+++ b/feeds/ipq807x_v5.4/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
@@ -72,7 +72,6 @@ case "$FIRMWARE" in
 	edgecore,oap102 |\
 	edgecore,oap103 |\
 	edgecore,eap106 |\
-	emplus,wap380c|\
 	qcom,ipq807x-hk01|\
 	qcom,ipq807x-hk14|\
 	tplink,ex227|\
--- a/feeds/ipq807x_v5.4/ipq807x/base-files/lib/upgrade/platform.sh
+++ b/feeds/ipq807x_v5.4/ipq807x/base-files/lib/upgrade/platform.sh
@@ -29,7 +29,6 @@ platform_check_image() {
 	edgecore,oap102|\
 	edgecore,oap103|\
 	edgecore,eap106|\
-	emplus,wap380c|\
 	sonicfi,rap650c|\
 	tplink,ex227|\
 	tplink,ex447)
@@ -49,8 +48,7 @@ platform_do_upgrade() {
 	tplink,ex227)	
 		qca_do_upgrade "$1"
 		;;
-	cig,wf196|\
-	emplus,wap380c)
+        cig,wf196)
                [ -f /proc/boot_info/rootfs/upgradepartition ] && {
                        CI_UBIPART="$(cat /proc/boot_info/rootfs/upgradepartition)"
                        CI_BOOTCFG=1
--- a/feeds/ipq807x_v5.4/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq807x-wap380c.dts
+++ b/feeds/ipq807x_v5.4/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq807x-wap380c.dts
@@ -1,648 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/dts-v1/;
-/* Copyright (c) 2020 The Linux Foundation. All rights reserved.
- */
-#include "ipq8074.dtsi"
-#include "ipq8074-ac-cpu.dtsi"
-
-/ {
-	#address-cells = <0x2>;
-	#size-cells = <0x2>;
-	model = "Emplus WAP380C";
-	compatible = "emplus,wap380c", "qcom,ipq8074-ap-hk07", "qcom,ipq8074";
-	qcom,msm-id = <0x143 0x0>;
-	interrupt-parent = <&intc>;
-
-	aliases {
-		serial0 = &blsp1_uart5;
-		/* Aliases as required by u-boot to patch MAC addresses */
-		ethernet0 = "/soc/dp6";
-
-		led-boot = &led_power;
-		led-failsafe = &led_power;
-		led-running = &led_power;
-		led-upgrade = &led_power;
-	};
-
-	chosen {
-		stdout-path = "serial0";
-	};
-
-	soc {
-		qti: ledc@191E000  {
-			compatible = "qti,ledc";
-			reg = <0x191E000 0x20070>;
-			reg-names = "ledc_base_addr";
-			qti,tcsr_ledc_values = <0x0320193 0x00000000 \
-									0x00000000 0x00000000 \
-									0x00000000 0xFFFFFFFF \
-									0xFFFF7FFF 0xFFFFFFFF \
-									0x007D0820 0x00000000 \
-									0x10482094 0x03FFFFE1>;
-			qti,ledc_blink_indices_cnt = <6>;
-			qti,ledc_blink_indices = <15 14 13 12 11 10>;
-			qti,ledc_blink_idx_src_pair = <5 20>;
-			status = "ok";
-		};
-
-		pinctrl@1000000 {
-			button_pins: button_pins {
-				reset_button {
-					pins = "gpio52";
-					function = "gpio";
-					drive-strength = <8>;
-					bias-pull-up;
-				};
-			};
-
-			mdio_pins: mdio_pinmux {
-				mux_0 {
-					pins = "gpio68";
-					function = "mdc";
-					drive-strength = <8>;
-					bias-pull-up;
-				};
-				mux_1 {
-					pins = "gpio69";
-					function = "mdio";
-					drive-strength = <8>;
-					bias-pull-up;
-				};
-				mux_2 {
-					pins = "gpio44";
-					function = "gpio";
-					bias-pull-up;
-				};
-			};
-
-			ledc_pins: ledc_pinmux {
-				led_clk {
-					pins = "gpio18";
-					function = "led0";
-					drive-strength = <8>;
-					bias-pull-down;
-				};
-				led_data {
-					pins = "gpio19";
-					function = "led1";
-					drive-strength = <8>;
-					bias-pull-down;
-				};
-				led_clr {
-					pins = "gpio20";
-					function = "led2";
-					drive-strength = <8>;
-					bias-pull-up;
-				};
-			};
-		};
-
-		serial@78b3000 {
-			status = "ok";
-		};
-
-		spi@78b5000 {
-			status = "ok";
-			pinctrl-0 = <&spi_0_pins>;
-			pinctrl-names = "default";
-			cs-select = <0>;
-
-			m25p80@0 {
-				  compatible = "n25q128a11";
-				  #address-cells = <1>;
-				  #size-cells = <1>;
-				  reg = <0>;
-				  spi-max-frequency = <50000000>;
-			};
-		};
-
-		dma@7984000 {
-			 status = "ok";
-		};
-
-		nand@79b0000 {
-			status = "ok";
-
-			nand@0 {
-				reg = <0>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				nand-ecc-strength = <4>;
-				nand-ecc-step-size = <512>;
-				nand-bus-width = <8>;
-			};
-		};
-
-		ssphy@78000 {
-			status = "ok";
-		};
-
-		ssphy@58000 {
-			status = "ok";
-		};
-
-		gpio_keys {
-			compatible = "gpio-keys";
-			pinctrl-0 = <&button_pins>;
-			pinctrl-names = "default";
-			status = "ok";
-
-			button@1 {
-				label = "reset";
-				linux,code = <KEY_RESTART>;
-				gpios = <&tlmm 52 GPIO_ACTIVE_LOW>;
-				linux,input-type = <1>;
-				debounce-interval = <60>;
-			};
-		};
-
-		mdio: mdio@90000 {
-			pinctrl-0 = <&mdio_pins>;
-			pinctrl-names = "default";
-			phy-reset-gpio = <&tlmm 43 1 &tlmm 44 1>;
-			phy0: ethernet-phy@0 {
-				reg = <0>;
-			};
-			phy1: ethernet-phy@1 {
-				reg = <1>;
-			};
-			phy2: ethernet-phy@2 {
-				reg = <2>;
-			};
-			phy3: ethernet-phy@3 {
-				reg = <3>;
-			};
-			phy4: ethernet-phy@4 {
-				reg = <4>;
-			};
-			phy5: ethernet-phy@5 {
-				reg = <28>;
-			};
-		};
-
-		ess-switch@3a000000 {
-			switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
-			switch_lan_bmp = <0x3e>; /* lan port bitmap */
-			switch_wan_bmp = <0x40>; /* wan port bitmap */
-			switch_mac_mode = <0x0>; /* mac mode for uniphy instance0*/
-			switch_mac_mode1 = <0xff>; /* mac mode for uniphy instance1*/
-			switch_mac_mode2 = <0xf>; /* mac mode for uniphy instance2*/
-			bm_tick_mode = <0>; /* bm tick mode */
-			tm_tick_mode = <0>; /* tm tick mode */
-			qcom,port_phyinfo {
-				port@0 {
-					port_id = <1>;
-					phy_address = <0>;
-				};
-				port@1 {
-					port_id = <2>;
-					phy_address = <1>;
-				};
-				port@2 {
-					port_id = <3>;
-					phy_address = <2>;
-				};
-				port@3 {
-					port_id = <4>;
-					phy_address = <3>;
-				};
-				port@4 {
-					port_id = <5>;
-					phy_address = <4>;
-				};
-				port@5 {
-					port_id = <6>;
-					phy_address = <28>;
-					port_mac_sel = "QGMAC_PORT";
-				};
-			};
-			port_scheduler_resource {
-				port@0 {
-					port_id = <0>;
-					ucast_queue = <0 143>;
-					mcast_queue = <256 271>;
-					l0sp = <0 35>;
-					l0cdrr = <0 47>;
-					l0edrr = <0 47>;
-					l1cdrr = <0 7>;
-					l1edrr = <0 7>;
-				};
-				port@1 {
-					port_id = <1>;
-					ucast_queue = <144 159>;
-					mcast_queue = <272 275>;
-					l0sp = <36 39>;
-					l0cdrr = <48 63>;
-					l0edrr = <48 63>;
-					l1cdrr = <8 11>;
-					l1edrr = <8 11>;
-				};
-				port@2 {
-					port_id = <2>;
-					ucast_queue = <160 175>;
-					mcast_queue = <276 279>;
-					l0sp = <40 43>;
-					l0cdrr = <64 79>;
-					l0edrr = <64 79>;
-					l1cdrr = <12 15>;
-					l1edrr = <12 15>;
-				};
-				port@3 {
-					port_id = <3>;
-					ucast_queue = <176 191>;
-					mcast_queue = <280 283>;
-					l0sp = <44 47>;
-					l0cdrr = <80 95>;
-					l0edrr = <80 95>;
-					l1cdrr = <16 19>;
-					l1edrr = <16 19>;
-				};
-				port@4 {
-					port_id = <4>;
-					ucast_queue = <192 207>;
-					mcast_queue = <284 287>;
-					l0sp = <48 51>;
-					l0cdrr = <96 111>;
-					l0edrr = <96 111>;
-					l1cdrr = <20 23>;
-					l1edrr = <20 23>;
-				};
-				port@5 {
-					port_id = <5>;
-					ucast_queue = <208 223>;
-					mcast_queue = <288 291>;
-					l0sp = <52 55>;
-					l0cdrr = <112 127>;
-					l0edrr = <112 127>;
-					l1cdrr = <24 27>;
-					l1edrr = <24 27>;
-				};
-				port@6 {
-					port_id = <6>;
-					ucast_queue = <224 239>;
-					mcast_queue = <292 295>;
-					l0sp = <56 59>;
-					l0cdrr = <128 143>;
-					l0edrr = <128 143>;
-					l1cdrr = <28 31>;
-					l1edrr = <28 31>;
-				};
-				port@7 {
-					port_id = <7>;
-					ucast_queue = <240 255>;
-					mcast_queue = <296 299>;
-					l0sp = <60 63>;
-					l0cdrr = <144 159>;
-					l0edrr = <144 159>;
-					l1cdrr = <32 35>;
-					l1edrr = <32 35>;
-				};
-			};
-			port_scheduler_config {
-				port@0 {
-					port_id = <0>;
-					l1scheduler {
-						group@0 {
-							sp = <0 1>; /*L0 SPs*/
-							/*cpri cdrr epri edrr*/
-							cfg = <0 0 0 0>;
-						};
-					};
-					l0scheduler {
-						group@0 {
-							/*unicast queues*/
-							ucast_queue = <0 4 8>;
-							/*multicast queues*/
-							mcast_queue = <256 260>;
-							/*sp cpri cdrr epri edrr*/
-							cfg = <0 0 0 0 0>;
-						};
-						group@1 {
-							ucast_queue = <1 5 9>;
-							mcast_queue = <257 261>;
-							cfg = <0 1 1 1 1>;
-						};
-						group@2 {
-							ucast_queue = <2 6 10>;
-							mcast_queue = <258 262>;
-							cfg = <0 2 2 2 2>;
-						};
-						group@3 {
-							ucast_queue = <3 7 11>;
-							mcast_queue = <259 263>;
-							cfg = <0 3 3 3 3>;
-						};
-					};
-				};
-				port@1 {
-					port_id = <1>;
-					l1scheduler {
-						group@0 {
-							sp = <36>;
-							cfg = <0 8 0 8>;
-						};
-						group@1 {
-							sp = <37>;
-							cfg = <1 9 1 9>;
-						};
-					};
-					l0scheduler {
-						group@0 {
-							ucast_queue = <144>;
-							ucast_loop_pri = <16>;
-							mcast_queue = <272>;
-							mcast_loop_pri = <4>;
-							cfg = <36 0 48 0 48>;
-						};
-					};
-				};
-				port@2 {
-					port_id = <2>;
-					l1scheduler {
-						group@0 {
-							sp = <40>;
-							cfg = <0 12 0 12>;
-						};
-						group@1 {
-							sp = <41>;
-							cfg = <1 13 1 13>;
-						};
-					};
-					l0scheduler {
-						group@0 {
-							ucast_queue = <160>;
-							ucast_loop_pri = <16>;
-							mcast_queue = <276>;
-							mcast_loop_pri = <4>;
-							cfg = <40 0 64 0 64>;
-						};
-					};
-				};
-				port@3 {
-					port_id = <3>;
-					l1scheduler {
-						group@0 {
-							sp = <44>;
-							cfg = <0 16 0 16>;
-						};
-						group@1 {
-							sp = <45>;
-							cfg = <1 17 1 17>;
-						};
-					};
-					l0scheduler {
-						group@0 {
-							ucast_queue = <176>;
-							ucast_loop_pri = <16>;
-							mcast_queue = <280>;
-							mcast_loop_pri = <4>;
-							cfg = <44 0 80 0 80>;
-						};
-					};
-				};
-				port@4 {
-					port_id = <4>;
-					l1scheduler {
-						group@0 {
-							sp = <48>;
-							cfg = <0 20 0 20>;
-						};
-						group@1 {
-							sp = <49>;
-							cfg = <1 21 1 21>;
-						};
-					};
-					l0scheduler {
-						group@0 {
-							ucast_queue = <192>;
-							ucast_loop_pri = <16>;
-							mcast_queue = <284>;
-							mcast_loop_pri = <4>;
-							cfg = <48 0 96 0 96>;
-						};
-					};
-				};
-				port@5 {
-					port_id = <5>;
-					l1scheduler {
-						group@0 {
-							sp = <52>;
-							cfg = <0 24 0 24>;
-						};
-						group@1 {
-							sp = <53>;
-							cfg = <1 25 1 25>;
-						};
-					};
-					l0scheduler {
-						group@0 {
-							ucast_queue = <208>;
-							ucast_loop_pri = <16>;
-							mcast_queue = <288>;
-							mcast_loop_pri = <4>;
-							cfg = <52 0 112 0 112>;
-						};
-					};
-				};
-				port@6 {
-					port_id = <6>;
-					l1scheduler {
-						group@0 {
-							sp = <56>;
-							cfg = <0 28 0 28>;
-						};
-						group@1 {
-							sp = <57>;
-							cfg = <1 29 1 29>;
-						};
-					};
-					l0scheduler {
-						group@0 {
-							ucast_queue = <224>;
-							ucast_loop_pri = <16>;
-							mcast_queue = <292>;
-							mcast_loop_pri = <4>;
-							cfg = <56 0 128 0 128>;
-						};
-					};
-				};
-				port@7 {
-					port_id = <7>;
-					l1scheduler {
-						group@0 {
-							sp = <60>;
-							cfg = <0 32 0 32>;
-						};
-						group@1 {
-							sp = <61>;
-							cfg = <1 33 1 33>;
-						};
-					};
-					l0scheduler {
-						group@0 {
-							ucast_queue = <240>;
-							ucast_loop_pri = <16>;
-							mcast_queue = <296>;
-							cfg = <60 0 144 0 144>;
-						};
-					};
-				};
-			};
-		};
-
-		dp6 {
-			device_type = "network";
-			compatible = "qcom,nss-dp";
-			qcom,id = <6>;
-			reg = <0x3a001800 0x200>;
-			qcom,mactype = <0>;
-			local-mac-address = [000000000000];
-			qcom,link-poll = <1>;
-			qcom,phy-mdio-addr = <28>;
-			phy-mode = "sgmii";
-		};
-
-		nss-macsec1 {
-			compatible = "qcom,nss-macsec";
-			phy_addr = <0x1c>;
-			mdiobus = <&mdio>;
-		};
-	};
-};
-
-&apc_cpr {
-	/* Same CPR configuration as OAK */
-	compatible = "qcom,cpr4-ipq817x-apss-regulator";
-
-	thread@0 {
-		apc_vreg: regulator {
-			regulator-min-microvolt = <1>;
-			regulator-max-microvolt = <2>;
-			qcom,cpr-fuse-corners = <2>;
-			qcom,cpr-corners = <3>;
-			qcom,cpr-speed-bin-corners = <3>;
-			qcom,cpr-corner-fmax-map = <1 3>;
-
-			qcom,cpr-voltage-ceiling =
-				<840000 904000 944000>;
-			qcom,cpr-voltage-floor =
-				<592000 648000 712000>;
-			qcom,corner-frequencies =
-				<1017600000 1382400000 1382400000>;
-
-			qcom,cpr-open-loop-voltage-fuse-adjustment-0 =
-				/* Speed bin 0; CPR rev 0..7 */
-				< 0      0>,
-				< 0      0>,
-				< 0      0>,
-				< 0      0>,
-				< 0      0>,
-				< 0      0>,
-				< 0      0>,
-				< 0      0>;
-
-			qcom,cpr-open-loop-voltage-fuse-adjustment-1 =
-				/* Speed bin 0; CPR rev 0..7 */
-				<     0      0>,
-				<     0      0>,
-				<     0      0>,
-				< 20000  26000>,
-				<     0      0>,
-				<     0      0>,
-				<     0      0>,
-				<     0      0>;
-
-			qcom,cpr-open-loop-voltage-fuse-adjustment-v2-0 =
-				/* Speed bin 0; CPR rev 0..7 */
-				<     0      0>,
-				<     0      0>,
-				<     0      0>,
-				<     0      0>,
-				<     0      0>,
-				<     0      0>,
-				<     0      0>,
-				<     0      0>;
-
-			qcom,cpr-open-loop-voltage-fuse-adjustment-v2-1 =
-				/* Speed bin 0; CPR rev 0..7 */
-				<     0      0>,
-				<     0   7000>,
-				<     0      0>,
-				<     0      0>,
-				<     0      0>,
-				<     0      0>,
-				<     0      0>,
-				<     0      0>;
-
-			qcom,cpr-floor-to-ceiling-max-range =
-				< 40000 40000 40000>,
-				< 40000 40000 40000>,
-				< 40000 40000 40000>,
-				< 40000 40000 40000>,
-				< 40000 40000 40000>,
-				< 40000 40000 40000>,
-				< 40000 40000 40000>,
-				< 40000 40000 40000>;
-		};
-	};
-};
-
-&npu_cpr {
-	status = "disabled";
-};
-
-&nss0 {
-	qcom,low-frequency = <187200000>;
-	qcom,mid-frequency = <748800000>;
-	qcom,max-frequency = <1497600000>;
-};
-
-&nss0 {
-	npu-supply = <&dummy_reg>;
-	mx-supply = <&dummy_reg>;
-};
-
-&wifi0 {
-	qcom,board_id = <0x92>;
-};
-
-&wifi1 {
-	qcom,board_id = <0x290>;
-};
-
-&ledc {
-	pinctrl-0 = <&ledc_pins>;
-	pinctrl-names = "default";
-	status = "ok";
-
-	led_power: led0 {
-		label = "ipq::led0";
-		linux,default-trigger = "default-on";
-	};
-
-	wan: led1 {
-		label = "ipq::led1";
-		linux,default-trigger = "netdev";
-	};
-
-	wifi2g: led2 {
-		label = "ipq::led2";
-		linux,default-trigger = "phy1tpt";
-	};
-
-	wifi5g: led3 {
-		label = "ipq::led3";
-		linux,default-trigger = "phy0tpt";
-	};
-
-	led4 {
-		label = "ipq::led4";
-		linux,default-trigger = "none";
-	};
-
-	led5 {
-		label = "ipq::led5";
-		linux,default-trigger = "none";
-	};
-};
--- a/feeds/ipq807x_v5.4/ipq807x/image/ipq807x.mk
+++ b/feeds/ipq807x_v5.4/ipq807x/image/ipq807x.mk
@@ -57,15 +57,6 @@ define Device/edgecore_eap106
 endef
 #TARGET_DEVICES += edgecore_eap106

-define Device/emplus_wap380c
-  DEVICE_TITLE := Emplus WAP380C
-  DEVICE_DTS := qcom-ipq807x-wap380c
-  DEVICE_DTS_CONFIG=config@hk07
-  SUPPORTED_DEVICES := emplus,wap380c
-  DEVICE_PACKAGES := ath11k-wifi-emplus-wap380c uboot-envtools
-endef
-TARGET_DEVICES += emplus_wap380c
-
 define Device/sonicfi_rap650c
  DEVICE_TITLE := SonicFi RAP650C
  DEVICE_DTS := qcom-ipq807x-rap650c
--- a/feeds/qca-wifi-7/ath12k-firmware/files/QCN92XX/Data.msc
+++ b/feeds/qca-wifi-7/ath12k-firmware/files/QCN92XX/Data.msc
--- a/feeds/qca-wifi-7/ath12k-firmware/files/QCN92XX/Data_dualmac.msc
+++ b/feeds/qca-wifi-7/ath12k-firmware/files/QCN92XX/Data_dualmac.msc
--- a/feeds/qca-wifi-7/ath12k-firmware/files/QCN92XX/amss.bin
+++ b/feeds/qca-wifi-7/ath12k-firmware/files/QCN92XX/amss.bin
--- a/feeds/qca-wifi-7/ath12k-firmware/files/QCN92XX/amss_dualmac.bin
+++ b/feeds/qca-wifi-7/ath12k-firmware/files/QCN92XX/amss_dualmac.bin
--- a/feeds/qca-wifi-7/ath12k-firmware/files/QCN92XX/m3.bin
+++ b/feeds/qca-wifi-7/ath12k-firmware/files/QCN92XX/m3.bin
--- a/feeds/qca-wifi-7/cig-platform-pkg/cig-device-boot/Makefile
+++ b/feeds/qca-wifi-7/cig-platform-pkg/cig-device-boot/Makefile
@@ -1,29 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=cig-device-boot
-PKG_RELEASE:=1
-PKG_LICENSE:=GPL-2.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/cig-device-boot
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+kmod-usb-serial-xr
-  TITLE:=CIG device init
-endef
-
-define Package/cig-device-boot/description
-  Initialize particular functions of the CIG device
-endef
-
-define Build/Compile
-
-endef
-
-define Package/cig-device-boot/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/cig-device.init $(1)/etc/init.d/cig-device-boot
-endef
-
-$(eval $(call BuildPackage,cig-device-boot))
--- a/feeds/qca-wifi-7/cig-platform-pkg/cig-device-boot/files/cig-device.init
+++ b/feeds/qca-wifi-7/cig-platform-pkg/cig-device-boot/files/cig-device.init
@@ -1,7 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-
-boot(){
-    [ -e /dev/ttyUSB0 ] && stty -F /dev/ttyUSB0 115200 cs8 -cstopb -parenb -icrnl -onlcr
-}
--- a/feeds/qca-wifi-7/cig-platform-pkg/cig-wifi-mode-sw/files/cig_wifi_mode_sw
+++ b/feeds/qca-wifi-7/cig-platform-pkg/cig-wifi-mode-sw/files/cig_wifi_mode_sw
@@ -3,9 +3,9 @@
 band=$1
 if [ $band -eq 2 ] || [ $band -eq 3 ]; then
 	echo $band > /proc/rf_switch
-	echo "firstboot for switch wifi mode 2/3 bands"
+	echo "reboot for switch wifi mode 2/3 bands"
 	sleep 1
-	firstboot -y -r
+	reboot
 else
 	echo "error band param"
 fi
--- a/feeds/qca-wifi-7/hostapd/patches/zzz-socket-read-buffer-size.patch
+++ b/feeds/qca-wifi-7/hostapd/patches/zzz-socket-read-buffer-size.patch
@@ -1,11 +0,0 @@
--- a/src/drivers/driver_nl80211.c
-+++ b/src/drivers/driver_nl80211.c
-@@ -127,7 +127,7 @@ static void nl80211_register_eloop_read(
- 	 */
- 	int err;
- 
-	err = nl_socket_set_buffer_size(*handle, 262144, 0);
-+	err = nl_socket_set_buffer_size(*handle, 1048576, 0);
- 	if (err < 0) {
- 		wpa_printf(MSG_DEBUG,
- 			   "nl80211: Could not set nl_socket RX buffer size: %s",
--- a/feeds/qca-wifi-7/ipq53xx/config-6.1
+++ b/feeds/qca-wifi-7/ipq53xx/config-6.1
@@ -1225,4 +1225,3 @@ CONFIG_PSTORE_PMSG=y
 CONFIG_PSTORE_RAM=y
 # CONFIG_RTL8221D_PHY is not set
 # CONFIG_INPUT_LSM303AGR is not set
-# CONFIG_USB_SERIAL_XR is not set
--- a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189h.dts
+++ b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189h.dts
@@ -85,15 +85,6 @@
 		/delete-node/ wcnss@4a900000;
 		/delete-node/ q6_caldb_region@4ce00000;

-        ramoops@49c00000 {
-            compatible = "ramoops";
-            no-map;
-            reg = <0x0 0x49c00000 0x0 0x50000>;
-            record-size = <0x20000>;
-            console-size = <0x8000>;
-            pmsg-size = <0x8000>;
-        };
-
 		q6_mem_regions: q6_mem_regions@4A900000  {
 			reg = <0x0 0x4a900000 0x0 0x6D00000>;
 			no-map;
--- a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189w.dts
+++ b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189w.dts
@@ -85,15 +85,6 @@
 		/delete-node/ wcnss@4a900000;
 		/delete-node/ q6_caldb_region@4ce00000;

-        ramoops@49c00000 {
-            compatible = "ramoops";
-            no-map;
-            reg = <0x0 0x49c00000 0x0 0x50000>;
-            record-size = <0x20000>;
-            console-size = <0x8000>;
-            pmsg-size = <0x8000>;
-        };
-
 		q6_mem_regions: q6_mem_regions@4A900000  {
 			reg = <0x0 0x4a900000 0x0 0x6D00000>;
 			no-map;
--- a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf672.dts
+++ b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf672.dts
@@ -18,21 +18,6 @@
 	model = "CIG WF672";
 	compatible = "cig,wf672", "qcom,ipq5332-rdp468", "qcom,ipq5332";

-    reserved-memory {
-        #address-cells = <2>;
-        #size-cells = <2>;
-        ranges;
-
-       ramoops@49c00000 {
-           compatible = "ramoops";
-           no-map;
-           reg = <0x0 0x49c00000 0x0 0x50000>;
-           record-size = <0x20000>;
-           console-size = <0x8000>;
-           pmsg-size = <0x8000>;
-       };
-    };
-
 	aliases {
 		serial0 = &blsp1_uart0;
 		serial1 = &blsp1_uart1;
@@ -74,8 +59,6 @@
 			num_devices = <0x1>;

 			ess-switch@3a000000 {
-				pinctrl-0 = <&sfp_pins>;
-				pinctrl-names = "default";
 				switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
 				switch_lan_bmp = <0x2>; /* lan port bitmap */
 				switch_wan_bmp = <0x4>; /* wan port bitmap */
@@ -301,7 +284,7 @@

 &blsp1_i2c1 {
 	status = "okay";
-	clock-frequency  = <100000>;
+	clock-frequency  = <400000>;
 	pinctrl-0 = <&i2c_1_pins>;
 	pinctrl-names = "default";
 	extgpio:pca9555@20{
@@ -459,13 +442,6 @@
                };
 	};

-	sfp_pins: sfp-state {
-		pins = "gpio43";
-		function = "gpio";
-		bias-pull-up;
-		input-enable;
-	};
-
 	spi_0_data_clk_pins: spi-0-data-clk-state {
 		pins = "gpio14", "gpio15", "gpio16";
 		function = "blsp0_spi";
--- a/feeds/qca-wifi-7/iw/patches/zzz-sync-nl80211.h.patch
+++ b/feeds/qca-wifi-7/iw/patches/zzz-sync-nl80211.h.patch
--- a/feeds/qca-wifi-7/mac80211/patches-zyxel_nwa130be/ath12k/0001-thermal-thermal-setting.patch
+++ b/feeds/qca-wifi-7/mac80211/patches-zyxel_nwa130be/ath12k/0001-thermal-thermal-setting.patch
@@ -1,6 +1,6 @@
-From f117d369cecadedefd2eb1467d52e9df76c14dc6 Mon Sep 17 00:00:00 2001
+From 1a46aa106a50a06bfa4b669d87a8143c3d59f2f4 Mon Sep 17 00:00:00 2001
 From: YenLin Pan <yenlin.pan@zyxel.com.tw>
-Date: Wed, 9 Jul 2025 14:46:13 +0800
+Date: Wed, 14 May 2025 14:14:22 +0800
 Subject: [PATCH] thermal: thermal setting

 lv0 -100 -hi0 105 -off0 0
@@ -10,11 +10,11 @@ lv3 105  -hi3 120 -off3 100

 Signed-off-by: YenLin Pan <YenLin.Pan@zyxel.com.tw>
 ---
- drivers/net/wireless/ath/ath12k/thermal.h | 24 +++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
+ drivers/net/wireless/ath/ath12k/thermal.h | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)

 diff --git a/drivers/net/wireless/ath/ath12k/thermal.h b/drivers/net/wireless/ath/ath12k/thermal.h
-index 5c91906..dae4488 100644
+index 5c91906..a493cd5 100644
 --- a/drivers/net/wireless/ath/ath12k/thermal.h
 +++ b/drivers/net/wireless/ath/ath12k/thermal.h
@@ -13,28 +13,28 @@
@@ -34,19 +34,15 @@ index 5c91906..dae4488 100644
 
 #define ATH12K_THERMAL_LVL0_V2_TEMP_LOW_MARK -100
 -#define ATH12K_THERMAL_LVL0_V2_TEMP_HIGH_MARK 95
-#define ATH12K_THERMAL_LVL1_V2_TEMP_LOW_MARK 90
-#define ATH12K_THERMAL_LVL1_V2_TEMP_HIGH_MARK 100
-#define ATH12K_THERMAL_LVL2_V2_TEMP_LOW_MARK 95
-#define ATH12K_THERMAL_LVL2_V2_TEMP_HIGH_MARK 105
-#define ATH12K_THERMAL_LVL3_V2_TEMP_LOW_MARK 100
-#define ATH12K_THERMAL_LVL3_V2_TEMP_HIGH_MARK 110
 +#define ATH12K_THERMAL_LVL0_V2_TEMP_HIGH_MARK 105
-+#define ATH12K_THERMAL_LVL1_V2_TEMP_LOW_MARK 95
+ #define ATH12K_THERMAL_LVL1_V2_TEMP_LOW_MARK 90
+-#define ATH12K_THERMAL_LVL1_V2_TEMP_HIGH_MARK 100
 +#define ATH12K_THERMAL_LVL1_V2_TEMP_HIGH_MARK 110
-+#define ATH12K_THERMAL_LVL2_V2_TEMP_LOW_MARK 100
-+#define ATH12K_THERMAL_LVL2_V2_TEMP_HIGH_MARK 115
-+#define ATH12K_THERMAL_LVL3_V2_TEMP_LOW_MARK 105
-+#define ATH12K_THERMAL_LVL3_V2_TEMP_HIGH_MARK 120
+ #define ATH12K_THERMAL_LVL2_V2_TEMP_LOW_MARK 95
+ #define ATH12K_THERMAL_LVL2_V2_TEMP_HIGH_MARK 105
+ #define ATH12K_THERMAL_LVL3_V2_TEMP_LOW_MARK 100
+-#define ATH12K_THERMAL_LVL3_V2_TEMP_HIGH_MARK 110
+#define ATH12K_THERMAL_LVL3_V2_TEMP_HIGH_MARK 115
 #define ATH12K_THERMAL_LVL4_V2_TEMP_LOW_MARK 105
 #define ATH12K_THERMAL_LVL4_V2_TEMP_HIGH_MARK 120
 
--- a/feeds/qca-wifi-7/platform_drivers/Makefile
+++ b/feeds/qca-wifi-7/platform_drivers/Makefile
@@ -475,22 +475,6 @@ endef

 $(eval $(call KernelPackage,usb-f-qdss))

-define KernelPackage/usb-serial-xr
-  TITLE:=USB xr Serial driver support
-  KCONFIG:=CONFIG_USB_SERIAL_XR
-  FILES:=\
-        $(LINUX_DIR)/drivers/usb/serial/xr_serial.ko
-  AUTOLOAD:=$(call AutoLoad,60,xr_serial)
-  DEPENDS:=+kmod-usb-serial
-  $(call AddPlatformDepends/usb)
-endef
-
-define KernelPackage/usb-serial-xr/description
- USB MaxLinear/Exar USB to Serial driver
-endef
-
-$(eval $(call KernelPackage,usb-serial-xr))
-
 LEDS_MENU:=LED modules

 define KernelPackage/leds-tlc591xx
--- a/feeds/tip/certificates/files/etc/uci-defaults/99-tip-certificates.sh
+++ b/feeds/tip/certificates/files/etc/uci-defaults/99-tip-certificates.sh
@@ -4,4 +4,3 @@ uci add system certificates
 uci set system.@certificates[-1].key=/etc/ucentral/key.pem
 uci set system.@certificates[-1].cert=/etc/ucentral/operational.pem
 uci set system.@certificates[-1].ca=/etc/ucentral/operational.ca
-uci commit
--- a/feeds/tip/certificates/files/usr/bin/mount_certs
+++ b/feeds/tip/certificates/files/usr/bin/mount_certs
@@ -105,10 +105,9 @@ cig,wf189h|\
 cig,wf186h|\
 cig,wf196|\
 cig,wf188n|\
-emplus,wap380c|\
 emplus,wap385c|\
-emplus,wap386v2|\
 emplus,wap581|\
+emplus,wap386v2|\
 yuncore,ax840|\
 yuncore,fap655)
 	PART_NAME=rootfs_1
--- a/feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery
+++ b/feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery
@@ -23,9 +23,9 @@ let offline_time;
 let orphan_time;
 let interval;
 let timeouts = {
-	'offline': 4 * 60 * 60,
+	'offline': 120,
 	'validate': 120,
-	'orphan': 2 * 60 * 60,
+	'orphan': 120,
 };

 ulog_open(ULOG_SYSLOG | ULOG_STDIO, LOG_DAEMON, "cloud_discover");
--- a/feeds/tip/cloud_discovery/files/usr/bin/est_client
+++ b/feeds/tip/cloud_discovery/files/usr/bin/est_client
@@ -65,11 +65,11 @@ function p7_too_pem(src, dst) {
 	return 0;
 }

-function call_est_server(path, cert, target) {
+function call_est_server(cert, target) {
 	if (generate_csr(cert))
 		return 1;

-	let ret = system('curl -X POST https://qaest.certificates.open-lan.org:8001/.well-known/est/' + path + ' -d @/tmp/csr.nohdr.p10 -H "Content-Type: application/pkcs10" --cert ' + cert + ' --key /etc/ucentral/key.pem --cacert /etc/ucentral/insta.pem -o /tmp/operational.nohdr.p7');
+	let ret = system('curl -X POST https://qaest.certificates.open-lan.org:8001/.well-known/est/simpleenroll -d @/tmp/csr.nohdr.p10 -H "Content-Type: application/pkcs10" --cert /etc/ucentral/cert.pem --key /etc/ucentral/key.pem --cacert /etc/ucentral/insta.pem -o /tmp/operational.nohdr.p7');
 	if (ret) {
 		ulog(LOG_INFO, 'Failed to request operational certificate\n');
 		return 1;
@@ -86,7 +86,7 @@ function simpleenroll() {
 		return 0;
 	}

-	if (call_est_server('simpleenroll', '/etc/ucentral/cert.pem', '/etc/ucentral/operational.pem'))
+	if (call_est_server('/etc/ucentral/cert.pem', '/etc/ucentral/operational.pem'))
 		return 1; 
 	
 	ulog(LOG_INFO, 'Operational cert acquired\n');
@@ -100,7 +100,7 @@ function simplereenroll() {
 		return 0;
 	}

-	if (call_est_server('simplereenroll', '/etc/ucentral/operational.pem', '/tmp/operational.pem'))
+	if (call_est_server('/etc/ucentral/operational.pem', '/tmp/operational.pem'))
 		return 1;
 	
 	ulog(LOG_INFO, 'Operational cert updated\n');
@@ -114,7 +114,7 @@ function load_operational_ca() {
 		ulog(LOG_INFO, 'Operational CA is present\n');
 		return 0;
 	}
-	let ret = system('curl -X GET https://qaest.certificates.open-lan.org:8001/.well-known/est/cacerts --cert /etc/ucentral/operational.pem --key /etc/ucentral/key.pem --cacert /etc/ucentral/insta.pem -o /tmp/operational.ca.nohdr.p7');
+	let ret = system('curl -X GET https://qaest.certificates.open-lan.org:8001/.well-known/est/cacerts --cert /etc/ucentral/cert.pem --key /etc/ucentral/key.pem --cacert /etc/ucentral/insta.pem -o /tmp/operational.ca.nohdr.p7');
 	if (!ret)
 		ret = p7_too_pem('/tmp/operational.ca.nohdr.p7', '/etc/ucentral/operational.ca');
 	if (ret) {
--- a/feeds/ucentral/modemmanager/Config.in
+++ b/feeds/ucentral/modemmanager/Config.in
@@ -1,30 +0,0 @@
-menu "Configuration"
-	depends on PACKAGE_modemmanager
-
-config MODEMMANAGER_WITH_MBIM
-	bool "Include MBIM support"
-	default y
-	help
-	  Compile ModemManager with MBIM support
-
-config MODEMMANAGER_WITH_QMI
-	bool "Include QMI support"
-	default y
-	help
-	  Compile ModemManager with QMI support
-
-config MODEMMANAGER_WITH_QRTR
-	bool "Include QRTR support"
-	default y
-	depends on MODEMMANAGER_WITH_QMI
-	select LIBQMI_WITH_QRTR_GLIB
-	help
-	  Compile ModemManager with QRTR support
-
-config MODEMMANAGER_WITH_AT_COMMAND_VIA_DBUS
-	bool "Allow AT commands via DBus"
-	default n
-	help
-	  Compile ModemManager allowing AT commands without debug flag
-
-endmenu
--- a/feeds/ucentral/modemmanager/Makefile
+++ b/feeds/ucentral/modemmanager/Makefile
@@ -1,140 +0,0 @@
-#
-# Copyright (C) 2016 Velocloud Inc.
-# Copyright (C) 2016 Aleksander Morgado <aleksander@aleksander.es>
-#
-# This is free software, licensed under the GNU General Public License v2.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=modemmanager
-PKG_SOURCE_VERSION:=1.20.6
-PKG_RELEASE:=12
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git
-PKG_MIRROR_HASH:=e90103e2e42bb826bbbac83937a9a69f50348cd6ce0d8da655a12b65494ce7c9
-
-PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>
-PKG_LICENSE:=GPL-2.0-or-later
-PKG_LICENSE_FILES:=COPYING
-
-PKG_BUILD_DEPENDS:=glib2/host libxslt/host
-PKG_BUILD_FLAGS:=gc-sections
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include $(INCLUDE_DIR)/meson.mk
-
-TARGET_CFLAGS += -fno-merge-all-constants -fmerge-constants
-
-define Package/modemmanager/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/modemmanager
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Control utility for any kind of mobile broadband modem
-  URL:=https://www.freedesktop.org/wiki/Software/ModemManager
-  DEPENDS:= \
-	$(INTL_DEPENDS) \
-	+glib2 \
-	+dbus \
-	+ppp \
-	+MODEMMANAGER_WITH_MBIM:libmbim \
-	+MODEMMANAGER_WITH_QMI:libqmi \
-	+MODEMMANAGER_WITH_QRTR:libqrtr-glib
-endef
-
-define Package/modemmanager/description
-  ModemManager is a D-Bus-activated service which allows controlling mobile
-  broadband modems. Add kernel modules for your modems as needed.
-  Select Utilities/usb-modeswitch if needed.
-endef
-
-MESON_ARGS += \
-	-Dudev=false \
-	-Dudevdir=/lib/udev \
-	-Dtests=false \
-	-Dsystemdsystemunitdir=no \
-	-Dsystemd_suspend_resume=false \
-	-Dsystemd_journal=false \
-	-Dpolkit=no \
-	-Dintrospection=false \
-	-Dman=false \
-	-Dbash_completion=false \
-	-Db_lto=true \
-	-Dmbim=$(if $(CONFIG_MODEMMANAGER_WITH_MBIM),true,false) \
-	-Dqmi=$(if $(CONFIG_MODEMMANAGER_WITH_QMI),true,false) \
-	-Dqrtr=$(if $(CONFIG_MODEMMANAGER_WITH_QRTR),true,false) \
-	-Dat_command_via_dbus=$(if $(CONFIG_MODEMMANAGER_WITH_AT_COMMAND_VIA_DBUS),true,false)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/ModemManager
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/ModemManager/*.h $(1)/usr/include/ModemManager
-	$(INSTALL_DIR) $(1)/usr/include/libmm-glib
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libmm-glib/*.h $(1)/usr/include/libmm-glib
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmm-glib.so* $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ModemManager.pc $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/mm-glib.pc $(1)/usr/lib/pkgconfig
-	$(INSTALL_DIR) $(1)/usr/share/dbus-1/interfaces
-	$(CP) $(PKG_BUILD_DIR)/introspection/org.freedesktop.ModemManager1.* $(1)/usr/share/dbus-1/interfaces
-endef
-
-define Package/modemmanager/install
-	$(INSTALL_DIR) $(1)/lib/udev/rules.d
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/lib/udev/rules.d/*.rules $(1)/lib/udev/rules.d
-
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ModemManager $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/usr/sbin/ModemManager-wrapper $(1)/usr/sbin
-
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mmcli $(1)/usr/bin
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmm-glib.so.* $(1)/usr/lib
-
-	$(INSTALL_DIR) $(1)/usr/lib/ModemManager
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ModemManager/libmm-shared-*.so* $(1)/usr/lib/ModemManager
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ModemManager/libmm-plugin-*.so* $(1)/usr/lib/ModemManager
-
-	$(INSTALL_DIR) $(1)/usr/lib/ModemManager/connection.d
-	$(INSTALL_BIN) ./files/10-report-down $(1)/usr/lib/ModemManager/connection.d
-
-	$(INSTALL_DIR) $(1)/etc/dbus-1/system.d
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/org.freedesktop.ModemManager1.conf $(1)/etc/dbus-1/system.d
-
-	$(INSTALL_DIR) $(1)/usr/share/dbus-1/system-services
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/dbus-1/system-services/org.freedesktop.ModemManager1.service $(1)/usr/share/dbus-1/system-services
-
-	$(INSTALL_DIR) $(1)/usr/share/ModemManager
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/ModemManager/*.conf $(1)/usr/share/ModemManager
-	$(INSTALL_DATA) ./files/modemmanager.common $(1)/usr/share/ModemManager
-
-	$(INSTALL_DIR) $(1)/usr/share/ModemManager/fcc-unlock.available.d
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/ModemManager/fcc-unlock.available.d/* $(1)/usr/share/ModemManager/fcc-unlock.available.d
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/modemmanager.init $(1)/etc/init.d/modemmanager
-
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/usb
-	$(INSTALL_DATA) ./files/25-modemmanager-usb $(1)/etc/hotplug.d/usb
-
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/net
-	$(INSTALL_DATA) ./files/25-modemmanager-net $(1)/etc/hotplug.d/net
-
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/tty
-	$(INSTALL_DATA) ./files/25-modemmanager-tty $(1)/etc/hotplug.d/tty
-
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/wwan
-	$(INSTALL_DATA) ./files/25-modemmanager-wwan $(1)/etc/hotplug.d/wwan
-
-	$(INSTALL_DIR) $(1)/lib/netifd/proto
-	$(INSTALL_BIN) ./files/modemmanager.proto $(1)/lib/netifd/proto/modemmanager.sh
-endef
-
-$(eval $(call BuildPackage,modemmanager))
--- a/feeds/ucentral/modemmanager/README.md
+++ b/feeds/ucentral/modemmanager/README.md
@@ -1,44 +0,0 @@
-# OpenWrt ModemManager
-
-## Description
-
-Cellular modem control and connectivity
-
-Optional libraries libmbim and libqmi are available.
-Your modem may require additional kernel modules and/or the usb-modeswitch
-package.
-
-## Usage
-
-Once installed, you can configure the 2G/3G/4G modem connections directly in
-/etc/config/network as in the following example:
-
-    config interface 'broadband'
-        option device      '/sys/devices/platform/soc/20980000.usb/usb1/1-1/1-1.2/1-1.2.1'
-        option proto       'modemmanager'
-        option apn         'ac.vodafone.es'
-        option allowedauth 'pap chap'
-        option username    'vodafone'
-        option password    'vodafone'
-        option pincode     '7423'
-        option iptype      'ipv4'
-        option plmn        '214001'
-        option lowpower    '1'
-        option signalrate  '30'
-        option allow_roaming '1'
-
-Only 'device' and 'proto' are mandatory options, the remaining ones are all
-optional.
-
-The 'allowedauth' option allows limiting the list of authentication protocols.
-It is given as a space-separated list of values, including any of the
-following: 'pap', 'chap', 'mschap', 'mschapv2' or 'eap'. It will default to
-allowing all protocols.
-
-The 'iptype' option supports any of these values: 'ipv4', 'ipv6' or 'ipv4v6'.
-It will default to 'ipv4' if not given.
-
-The 'plmn' option allows to set the network operator MCCMNC.
-
-The 'signalrate' option set's the signal refresh rate (in seconds) for the device.
-You can call signal info with command: mmcli -m 0 --signal-get
--- a/feeds/ucentral/modemmanager/files/10-report-down
+++ b/feeds/ucentral/modemmanager/files/10-report-down
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# SPDX-License-Identifier: CC0-1.0
-# 2022 Aleksander Morgado <aleksander@aleksander.es>
-#
-# Automatically report to netifd that the underlying modem
-# is really disconnected
-#
-# require program name and at least 4 arguments
-[ $# -lt 4 ] && exit 1
-
-MODEM_PATH="$1"
-BEARER_PATH="$2"
-INTERFACE="$3"
-STATE="$4"
-
-[ "${STATE}" = "disconnected" ] || exit 0
-
-. /usr/share/ModemManager/modemmanager.common
-. /lib/netifd/netifd-proto.sh
-INCLUDE_ONLY=1 . /lib/netifd/proto/modemmanager.sh
-
-MODEM_STATUS=$(mmcli --modem="${MODEM_PATH}" --output-keyvalue)
-[ -n "${MODEM_STATUS}" ] || exit 1
-
-MODEM_DEVICE=$(modemmanager_get_field "${MODEM_STATUS}" "modem.generic.device")
-[ -n "${MODEM_DEVICE}" ] || exit 2
-
-CFG=$(mm_get_modem_config "${MODEM_DEVICE}")
-[ -n "${CFG}" ] || exit 3
-
-logger -t "modemmanager" "interface ${CFG} (network device ${INTERFACE}) ${STATE}"
-proto_init_update $INTERFACE 0
-proto_send_update $CFG
-exit 0
--- a/feeds/ucentral/modemmanager/files/25-modemmanager-net
+++ b/feeds/ucentral/modemmanager/files/25-modemmanager-net
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2016 Velocloud Inc
-# Copyright (C) 2016 Aleksander Morgado <aleksander@aleksander.es>
-
-# Load common utilities
-. /usr/share/ModemManager/modemmanager.common
-
-# We require a interface name
-[ -n "${INTERFACE}" ] || exit
-
-# Always make sure the rundir exists
-mkdir -m 0755 -p "${MODEMMANAGER_RUNDIR}"
-
-# Report network interface
-mm_log "info" "${ACTION} network interface ${INTERFACE}: event processed"
-mm_report_event "${ACTION}" "${INTERFACE}" "net" "/sys${DEVPATH}"
-
-# Look for an associated cdc-wdm interface
-
-cdcwdm=""
-
-case "${ACTION}" in
-	"add")	  cdcwdm=$(mm_track_cdcwdm "${INTERFACE}") ;;
-	"remove") cdcwdm=$(mm_untrack_cdcwdm "${INTERFACE}") ;;
-esac
-
-# Report cdc-wdm device, if any
-[ -n "${cdcwdm}" ] && {
-	mm_log "info" "${ACTION} cdc interface ${cdcwdm}: custom event processed"
-	mm_report_event "${ACTION}" "${cdcwdm}" "usbmisc" "/sys${DEVPATH}"
-}
--- a/feeds/ucentral/modemmanager/files/25-modemmanager-tty
+++ b/feeds/ucentral/modemmanager/files/25-modemmanager-tty
@@ -1,16 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2016 Velocloud Inc
-# Copyright (C) 2016 Aleksander Morgado <aleksander@aleksander.es>
-
-# Load hotplug common utilities
-. /usr/share/ModemManager/modemmanager.common
-
-# We require a device name
-[ -n "$DEVNAME" ] || exit
-
-# Always make sure the rundir exists
-mkdir -m 0755 -p "${MODEMMANAGER_RUNDIR}"
-
-# Report TTY
-mm_log "info" "${ACTION} serial interface ${DEVNAME}: event processed"
-mm_report_event "${ACTION}" "${DEVNAME}" "tty" "/sys${DEVPATH}"
--- a/feeds/ucentral/modemmanager/files/25-modemmanager-usb
+++ b/feeds/ucentral/modemmanager/files/25-modemmanager-usb
@@ -1,13 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2019 Aleksander Morgado <aleksander@aleksander.es>
-
-# We need to process only full USB device removal events, we don't
-# want to process specific interface removal events.
-[ "$ACTION" = remove ] || exit
-[ -z "${INTERFACE}" ] || exit
-
-# Load common utilities
-. /usr/share/ModemManager/modemmanager.common
-
-mm_clear_modem_wait_status "/sys${DEVPATH}"
-mm_cleanup_interface_by_sysfspath "/sys${DEVPATH}"
--- a/feeds/ucentral/modemmanager/files/25-modemmanager-wwan
+++ b/feeds/ucentral/modemmanager/files/25-modemmanager-wwan
@@ -1,15 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2021 Aleksander Morgado <aleksander@aleksander.es>
-
-# Load hotplug common utilities
-. /usr/share/ModemManager/modemmanager.common
-
-# We require a device name
-[ -n "$DEVNAME" ] || exit
-
-# Always make sure the rundir exists
-mkdir -m 0755 -p "${MODEMMANAGER_RUNDIR}"
-
-# Report wwan
-mm_log "info" "${ACTION} wwan control port ${DEVNAME}: event processed"
-mm_report_event "${ACTION}" "${DEVNAME}" "wwan" "/sys${DEVPATH}"
--- a/feeds/ucentral/modemmanager/files/modemmanager.common
+++ b/feeds/ucentral/modemmanager/files/modemmanager.common
@@ -1,376 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2016 Velocloud Inc
-# Copyright (C) 2016 Aleksander Morgado <aleksander@aleksander.es>
-
-################################################################################
-
-. /lib/functions.sh
-. /lib/netifd/netifd-proto.sh
-
-################################################################################
-# Runtime state
-
-MODEMMANAGER_RUNDIR="/var/run/modemmanager"
-MODEMMANAGER_PID_FILE="${MODEMMANAGER_RUNDIR}/modemmanager.pid"
-MODEMMANAGER_CDCWDM_CACHE="${MODEMMANAGER_RUNDIR}/cdcwdm.cache"
-MODEMMANAGER_SYSFS_CACHE="${MODEMMANAGER_RUNDIR}/sysfs.cache"
-MODEMMANAGER_EVENTS_CACHE="${MODEMMANAGER_RUNDIR}/events.cache"
-
-################################################################################
-# Common logging
-
-mm_log() {
-	local level="$1"; shift
-	logger -p "daemon.${level}" -t "ModemManager[$$]" "hotplug: $*"
-}
-
-################################################################################
-# Receives as input argument the full sysfs path of the device
-# Returns the physical device sysfs path
-#
-# NOTE: this method only works when the device exists, i.e. it cannot be used
-# on removal hotplug events
-
-mm_find_physdev_sysfs_path() {
-	local tmp_path="$1"
-
-	while true; do
-		tmp_path=$(dirname "${tmp_path}")
-
-		# avoid infinite loops iterating
-		[ -z "${tmp_path}" ] || [ "${tmp_path}" = "/" ] && return
-
-		# For USB devices, the physical device will be that with a idVendor
-		# and idProduct pair of files
-		[ -f "${tmp_path}"/idVendor ] && [ -f "${tmp_path}"/idProduct ] && {
-			tmp_path=$(readlink -f "$tmp_path")
-			echo "${tmp_path}"
-			return
-		}
-
-		# For PCI devices, the physical device will be that with a vendor
-		# and device pair of files
-		[ -f "${tmp_path}"/vendor ] && [ -f "${tmp_path}"/device ] && {
-			tmp_path=$(readlink -f "$tmp_path")
-			echo "${tmp_path}"
-			return
-		}
-	done
-}
-
-################################################################################
-
-# Returns the cdc-wdm name retrieved from sysfs
-mm_track_cdcwdm() {
-	local wwan="$1"
-	local cdcwdm
-
-	cdcwdm=$(ls "/sys/class/net/${wwan}/device/usbmisc/")
-	[ -n "${cdcwdm}" ] || return
-
-	# We have to cache it for later, as we won't be able to get the
-	# associated cdc-wdm device on a remove event
-	echo "${wwan} ${cdcwdm}" >> "${MODEMMANAGER_CDCWDM_CACHE}"
-
-	echo "${cdcwdm}"
-}
-
-# Returns the cdc-wdm name retrieved from the cache
-mm_untrack_cdcwdm() {
-	local wwan="$1"
-	local cdcwdm
-
-	# Look for the cached associated cdc-wdm device
-	[ -f "${MODEMMANAGER_CDCWDM_CACHE}" ] || return
-
-	cdcwdm=$(awk -v wwan="${wwan}" '!/^#/ && $0 ~ wwan { print $2 }' "${MODEMMANAGER_CDCWDM_CACHE}")
-	[ -n "${cdcwdm}" ] || return
-
-	# Remove from cache
-	sed -i "/${wwan} ${cdcwdm}/d" "${MODEMMANAGER_CDCWDM_CACHE}"
-
-	echo "${cdcwdm}"
-}
-
-################################################################################
-# ModemManager needs some time from the ports being added until a modem object
-# is exposed in DBus. With the logic here we do an explicit wait of N seconds
-# for ModemManager to expose the new modem object, making sure that the wait is
-# unique per device (i.e. per physical device sysfs path).
-
-# Gets the modem wait status as retrieved from the cache
-mm_get_modem_wait_status() {
-	local sysfspath="$1"
-
-	# If no sysfs cache file, we're done
-	[ -f "${MODEMMANAGER_SYSFS_CACHE}" ] || return
-
-	# Get status of the sysfs path
-	awk -v sysfspath="${sysfspath}" '!/^#/ && $0 ~ sysfspath { print $2 }' "${MODEMMANAGER_SYSFS_CACHE}"
-}
-
-# Clear the modem wait status from the cache, if any
-mm_clear_modem_wait_status() {
-	local sysfspath="$1"
-
-	local escaped_sysfspath
-
-	[ -f "${MODEMMANAGER_SYSFS_CACHE}" ] && {
-		# escape '/', '\' and '&' for sed...
-		escaped_sysfspath=$(echo "$sysfspath" | sed -e 's/[\/&]/\\&/g')
-		sed -i "/${escaped_sysfspath}/d" "${MODEMMANAGER_SYSFS_CACHE}"
-	}
-}
-
-# Sets the modem wait status in the cache
-mm_set_modem_wait_status() {
-	local sysfspath="$1"
-	local status="$2"
-
-	# Remove sysfs line before adding the new one with the new state
-	mm_clear_modem_wait_status "${sysfspath}"
-
-	# Add the new status
-	echo "${sysfspath} ${status}" >> "${MODEMMANAGER_SYSFS_CACHE}"
-}
-
-# Callback for config_foreach()
-mm_get_modem_config_foreach_cb() {
-	local cfg="$1"
-	local sysfspath="$2"
-
-	local proto
-	config_get proto "${cfg}" proto
-	[ "${proto}" = modemmanager ] || return 0
-
-	local dev
-	dev=$(uci_get network "${cfg}" device)
-	[ "${dev}" = "${sysfspath}" ] || return 0
-
-	echo "${cfg}"
-}
-
-# Returns the name of the interface configured for this device
-mm_get_modem_config() {
-	local sysfspath="$1"
-
-	# Look for configuration for the given sysfs path
-	config_load network
-	config_foreach mm_get_modem_config_foreach_cb interface "${sysfspath}"
-}
-
-# Callback for config_foreach()
-mm_get_wwan_config_foreach_cb() {
-	local cfg="$1"
-	local sysfspath="$2"
-
-	local proto
-	config_get proto "${cfg}" proto
-	[ "${proto}" = "wwan" ] || return 0
-
-	local dev devname devpath
-	dev=$(uci_get network "${cfg}" device)
-	devname=$(basename "${dev}")
-	devpath=$(find /sys/devices -name "${devname}")
-	[[ "${devpath}" = "${sysfspath}*" ]] || return 0
-
-	echo "${cfg}"
-}
-
-# Returns the name of the interface configured for this device
-mm_get_wwan_config() {
-	local sysfspath="$1"
-
-	# Look for configuration for the given sysfs path
-	config_load network
-	config_foreach mm_get_wwan_config_foreach_cb interface "${sysfspath}"
-}
-
-# Wait for a modem in the specified sysfspath
-mm_wait_for_modem() {
-	local cfg="$1"
-	local sysfspath="$2"
-
-	# TODO: config max wait
-	local n=45
-	local step=5
-
-	while [ $n -ge 0 ]; do
-		[ -d "${sysfspath}" ] || {
-			mm_log "error" "ignoring modem detection request: no device at ${sysfspath}"
-			proto_set_available "${cfg}" 0
-			return 1
-		}
-
-		# Check if the modem exists at the given sysfs path
-		if ! mmcli -m "${sysfspath}" > /dev/null 2>&1
-		then
-			mm_log "error" "modem not detected at sysfs path"
-		else
-			mm_log "info" "modem exported successfully at ${sysfspath}"
-			mm_log "info" "setting interface '${cfg}' as available"
-			proto_set_available "${cfg}" 1
-			ifup "${cfg}"
-			return 0
-		fi
-
-		sleep $step
-		n=$((n-step))
-	done
-
-	mm_log "error" "timed out waiting for the modem to get exported at ${sysfspath}"
-	proto_set_available "${cfg}" 0
-	return 2
-}
-
-mm_report_modem_wait() {
-	local sysfspath=$1
-
-	local parent_sysfspath status
-
-	parent_sysfspath=$(mm_find_physdev_sysfs_path "$sysfspath")
-	[ -n "${parent_sysfspath}" ] || {
-		mm_log "error" "parent device sysfspath not found"
-		return
-	}
-
-	status=$(mm_get_modem_wait_status "${parent_sysfspath}")
-	case "${status}" in
-		"")
-			local cfg
-
-			cfg=$(mm_get_modem_config "${parent_sysfspath}")
-			[ -z "${cfg}" ] && cfg=$(mm_get_wwan_config "${parent_sysfspath}")
-			if [ -n "${cfg}" ]; then
-				mm_log "info" "interface '${cfg}' is set to configure device '${parent_sysfspath}'"
-				mm_log "info" "now waiting for modem at sysfs path ${parent_sysfspath}"
-				mm_set_modem_wait_status "${parent_sysfspath}" "processed"
-				# Launch subshell for the explicit wait
-				( mm_wait_for_modem "${cfg}" "${parent_sysfspath}" ) > /dev/null 2>&1 &
-			fi
-			;;
-		"processed")
-			mm_log "info" "already waiting for modem at sysfs path ${parent_sysfspath}"
-			;;
-		"ignored")
-			;;
-		*)
-			mm_log "error" "unknown status read for device at sysfs path ${parent_sysfspath}"
-			;;
-	esac
-}
-
-################################################################################
-# Cleanup interfaces
-
-mm_cleanup_interface_cb() {
-	local cfg="$1"
-
-	local proto
-	config_get proto "${cfg}" proto
-	[ "${proto}" = modemmanager ] || return 0
-
-	proto_set_available "${cfg}" 0
-}
-
-mm_cleanup_interfaces() {
-	config_load network
-	config_foreach mm_cleanup_interface_cb interface
-}
-
-mm_cleanup_interface_by_sysfspath() {
-	local dev="$1"
-
-	local cfg
-	cfg=$(mm_get_modem_config "$dev")
-	[ -n "${cfg}" ] || return
-
-	mm_log "info" "setting interface '$cfg' as unavailable"
-	proto_set_available "${cfg}" 0
-}
-
-################################################################################
-# Event reporting
-
-# Receives as input the action, the device name and the subsystem
-mm_report_event() {
-	local action="$1"
-	local name="$2"
-	local subsystem="$3"
-	local sysfspath="$4"
-
-	# Do not save virtual devices
-	local virtual
-	virtual="$(echo "$sysfspath" | cut -d'/' -f4)"
-	[ "$virtual" = "virtual" ] && {
-		mm_log "debug" "sysfspath is a virtual device ($sysfspath)"
-		return
-	}
-
-	# Track/untrack events in cache
-	case "${action}" in
-		"add")
-			# On add events, store event details in cache (if not exists yet)
-			grep -qs "${name},${subsystem}" "${MODEMMANAGER_EVENTS_CACHE}" || \
-				echo "${action},${name},${subsystem},${sysfspath}" >> "${MODEMMANAGER_EVENTS_CACHE}"
-			;;
-		"remove")
-			# On remove events, remove old events from cache (match by subsystem+name)
-			sed -i "/${name},${subsystem}/d" "${MODEMMANAGER_EVENTS_CACHE}"
-			;;
-	esac
-
-	# Report the event
-	mm_log "debug" "event reported: action=${action}, name=${name}, subsystem=${subsystem}"
-	mmcli --report-kernel-event="action=${action},name=${name},subsystem=${subsystem}" 1>/dev/null 2>&1 &
-
-	# Wait for added modem if a sysfspath is given
-	[ -n "${sysfspath}" ] && [ "$action" = "add" ] && mm_report_modem_wait "${sysfspath}"
-}
-
-mm_report_event_from_cache_line() {
-	local event_line="$1"
-
-	local action name subsystem sysfspath
-	action=$(echo "${event_line}" | awk -F ',' '{ print $1 }')
-	name=$(echo "${event_line}" | awk -F ',' '{ print $2 }')
-	subsystem=$(echo "${event_line}" | awk -F ',' '{ print $3 }')
-	sysfspath=$(echo "${event_line}" | awk -F ',' '{ print $4 }')
-
-	mm_log "debug" "cached event found: action=${action}, name=${name}, subsystem=${subsystem}, sysfspath=${sysfspath}"
-	mm_report_event "${action}" "${name}" "${subsystem}" "${sysfspath}"
-}
-
-mm_report_events_from_cache() {
-	# Remove the sysfs cache
-	rm -f "${MODEMMANAGER_SYSFS_CACHE}"
-
-	local n=60
-	local step=1
-	local mmrunning=0
-
-	# Wait for ModemManager to be available in the bus
-	while [ $n -ge 0 ]; do
-		sleep $step
-		mm_log "info" "checking if ModemManager is available..."
-
-		if ! mmcli -L >/dev/null 2>&1
-		then
-			mm_log "info" "ModemManager not yet available"
-		else
-			mmrunning=1
-			break
-		fi
-		n=$((n-step))
-	done
-
-	[ ${mmrunning} -eq 1 ] || {
-		mm_log "error" "couldn't report initial kernel events: ModemManager not running"
-		return
-	}
-
-	# Report cached kernel events
-	while IFS= read -r event_line; do
-		mm_report_event_from_cache_line "${event_line}"
-	done < ${MODEMMANAGER_EVENTS_CACHE}
-}
--- a/feeds/ucentral/modemmanager/files/modemmanager.init
+++ b/feeds/ucentral/modemmanager/files/modemmanager.init
@@ -1,49 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2016 Aleksander Morgado <aleksander@aleksander.es>
-
-USE_PROCD=1
-START=70
-
-LOG_LEVEL="INFO"
-
-stop_service() {
-	# Load common utils
-	. /usr/share/ModemManager/modemmanager.common
-	# Set all configured interfaces as unavailable
-	mm_cleanup_interfaces
-}
-
-start_service() {
-	# Setup ModemManager service
-	#
-	# We will make sure that the rundir always exists, and we initially cleanup
-	# all interfaces flagging them as unavailable.
-	#
-	# The cached events processing will wait for MM to be available in DBus
-	# and will make sure all ports are re-notified to ModemManager every time
-	# it starts.
-	#
-	# All these commands need to be executed on every MM start, even after
-	# procd-triggered respawns, which is why this is wrapped in a startup
-	# wrapper script called '/usr/sbin/ModemManager-wrapper'.
-	#
-	. /usr/share/ModemManager/modemmanager.common
-	procd_open_instance
-	procd_set_param command /usr/sbin/ModemManager-wrapper
-	procd_append_param command --log-level="$LOG_LEVEL"
-	[ "$LOG_LEVEL" = "DEBUG" ] && procd_append_param command --debug
-	procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}"
-	procd_set_param pidfile "${MODEMMANAGER_PID_FILE}"
-	procd_close_instance
-}
-
-reload_service()
-{
-	stop
-	start
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger network
-}
--- a/feeds/ucentral/modemmanager/files/modemmanager.proto
+++ b/feeds/ucentral/modemmanager/files/modemmanager.proto
@@ -1,650 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2016-2019 Aleksander Morgado <aleksander@aleksander.es>
-
-[ -x /usr/bin/mmcli ] || exit 0
-[ -x /usr/sbin/pppd ] || exit 0
-
-[ -n "$INCLUDE_ONLY" ] || {
-	. /lib/functions.sh
-	. ../netifd-proto.sh
-	. ./ppp.sh
-	init_proto "$@"
-}
-
-cdr2mask ()
-{
-	# Number of args to shift, 255..255, first non-255 byte, zeroes
-	set -- $(( 5 - ($1 / 8) )) 255 255 255 255 $(( (255 << (8 - ($1 % 8))) & 255 )) 0 0 0
-	if [ "$1" -gt 1 ]
-	then
-		shift "$1"
-	else
-		shift
-	fi
-	echo "${1-0}"."${2-0}"."${3-0}"."${4-0}"
-}
-
-# This method expects as first argument a list of key-value pairs, as returned by mmcli --output-keyvalue
-# The second argument must be exactly the name of the field to read
-#
-# Sample output:
-#     $ mmcli -m 0 -K
-#     modem.dbus-path                                 : /org/freedesktop/ModemManager1/Modem/0
-#     modem.generic.device-identifier                 : ed6eff2e3e0f90463da1c2a755b2acacd1335752
-#     modem.generic.manufacturer                      : Dell Inc.
-#     modem.generic.model                             : DW5821e Snapdragon X20 LTE
-#     modem.generic.revision                          : T77W968.F1.0.0.4.0.GC.009\n026
-#     modem.generic.carrier-configuration             : GCF
-#     modem.generic.carrier-configuration-revision    : 08E00009
-#     modem.generic.hardware-revision                 : DW5821e Snapdragon X20 LTE
-#     ....
-modemmanager_get_field() {
-	local list=$1
-	local field=$2
-	local value=""
-
-	[ -z "${list}" ] || [ -z "${field}" ] && return
-
-	# there is always at least a whitespace after each key, and we use that as part of the
-	# key matching we do (e.g. to avoid getting 'modem.generic.state-failed-reason' as a result
-	# when grepping for 'modem.generic.state'.
-	line=$(echo "${list}" | grep "${field} ")
-	value=$(echo ${line#*:})
-
-	# not found?
-	[ -n "${value}" ] || return 2
-
-	# only print value if set
-	[ "${value}" != "--" ] && echo "${value}"
-	return 0
-}
-
-# build a comma-separated list of values from the list
-modemmanager_get_multivalue_field() {
-	local list=$1
-	local field=$2
-	local value=""
-	local length idx item
-
-	[ -z "${list}" ] || [ -z "${field}" ] && return
-
-	length=$(modemmanager_get_field "${list}" "${field}.length")
-	[ -n "${length}" ] || return 0
-	[ "$length" -ge 1 ] || return 0
-
-	idx=1
-	while [ $idx -le "$length" ]; do
-		item=$(modemmanager_get_field "${list}" "${field}.value\[$idx\]")
-		[ -n "${item}" ] && [ "${item}" != "--" ] && {
-			[ -n "${value}" ] && value="${value}, "
-			value="${value}${item}"
-		}
-		idx=$((idx + 1))
-	done
-
-	# nothing built?
-	[ -n "${value}" ] || return 2
-
-	# only print value if set
-	echo "${value}"
-	return 0
-}
-
-modemmanager_cleanup_connection() {
-	local modemstatus="$1"
-
-	local bearercount idx bearerpath
-
-	bearercount=$(modemmanager_get_field "${modemstatus}" "modem.generic.bearers.length")
-
-	# do nothing if no bearers reported
-	[ -n "${bearercount}" ] && [ "$bearercount" -ge 1 ] && {
-		# explicitly disconnect just in case
-		mmcli --modem="${device}" --simple-disconnect >/dev/null 2>&1
-		# and remove all bearer objects, if any found
-		idx=1
-		while [ $idx -le "$bearercount" ]; do
-			bearerpath=$(modemmanager_get_field "${modemstatus}" "modem.generic.bearers.value\[$idx\]")
-			mmcli --modem "${device}" --delete-bearer="${bearerpath}" >/dev/null 2>&1
-			idx=$((idx + 1))
-		done
-	}
-}
-
-modemmanager_connected_method_ppp_ipv4() {
-	local interface="$1"
-	local ttyname="$2"
-	local username="$3"
-	local password="$4"
-	local allowedauth="$5"
-
-	# all auth types are allowed unless a user given list is given
-	local authopts
-	local pap=1
-	local chap=1
-	local mschap=1
-	local mschapv2=1
-	local eap=1
-
-	[ -n "$allowedauth" ] && {
-		pap=0 chap=0 mschap=0 mschapv2=0 eap=0
-		for auth in $allowedauth; do
-			case $auth in
-				"pap") pap=1 ;;
-				"chap") chap=1 ;;
-				"mschap") mschap=1 ;;
-				"mschapv2") mschapv2=1 ;;
-				"eap") eap=1 ;;
-				*) ;;
-			esac
-		done
-	}
-
-	[ $pap -eq 1 ] || append authopts "refuse-pap"
-	[ $chap -eq 1 ] || append authopts "refuse-chap"
-	[ $mschap -eq 1 ] || append authopts "refuse-mschap"
-	[ $mschapv2 -eq 1 ] || append authopts "refuse-mschap-v2"
-	[ $eap -eq 1 ] || append authopts "refuse-eap"
-
-	proto_run_command "${interface}" /usr/sbin/pppd \
-		"${ttyname}" \
-		115200 \
-		nodetach \
-		noaccomp \
-		nobsdcomp \
-		nopcomp \
-		novj \
-		noauth \
-		$authopts \
-		${username:+ user "$username"} \
-		${password:+ password "$password"} \
-		lcp-echo-failure 5 \
-		lcp-echo-interval 15 \
-		lock \
-		crtscts \
-		nodefaultroute \
-		usepeerdns \
-		ipparam "${interface}" \
-		ip-up-script /lib/netifd/ppp-up \
-		ip-down-script /lib/netifd/ppp-down
-}
-
-modemmanager_disconnected_method_ppp_ipv4() {
-	local interface="$1"
-
-	echo "running disconnection (ppp method)"
-
-	[ -n "${ERROR}" ] && {
-		local errorstring
-		errorstring=$(ppp_exitcode_tostring "${ERROR}")
-		case "$ERROR" in
-			0)
-				;;
-			2)
-				proto_notify_error "$interface" "$errorstring"
-				proto_block_restart "$interface"
-				;;
-			*)
-				proto_notify_error "$interface" "$errorstring"
-				;;
-		esac
-	} || echo "pppd result code not given"
-
-	proto_kill_command "$interface"
-}
-
-modemmanager_connected_method_dhcp_ipv4() {
-	local interface="$1"
-	local wwan="$2"
-	local metric="$3"
-
-	proto_init_update "${wwan}" 1
-	proto_set_keep 1
-	proto_send_update "${interface}"
-
-	json_init
-	json_add_string name "${interface}_4"
-	json_add_string ifname "@${interface}"
-	json_add_string proto "dhcp"
-	proto_add_dynamic_defaults
-	[ -n "$metric" ] && json_add_int metric "${metric}"
-	json_close_object
-	ubus call network add_dynamic "$(json_dump)"
-}
-
-modemmanager_connected_method_static_ipv4() {
-	local interface="$1"
-	local wwan="$2"
-	local address="$3"
-	local prefix="$4"
-	local gateway="$5"
-	local mtu="$6"
-	local dns1="$7"
-	local dns2="$8"
-	local metric="$9"
-
-	local mask=""
-
-	[ -n "${address}" ] || {
-		proto_notify_error "${interface}" ADDRESS_MISSING
-		return
-	}
-
-	[ -n "${prefix}" ] || {
-		proto_notify_error "${interface}" PREFIX_MISSING
-		return
-	}
-	mask=$(cdr2mask "${prefix}")
-
-	[ -n "${mtu}" ] && /sbin/ip link set dev "${wwan}" mtu "${mtu}"
-
-	proto_init_update "${wwan}" 1
-	proto_set_keep 1
-	echo "adding IPv4 address ${address}, netmask ${mask}"
-	proto_add_ipv4_address "${address}" "${mask}"
-	[ -n "${gateway}" ] && {
-		echo "adding default IPv4 route via ${gateway}"
-		proto_add_ipv4_route "0.0.0.0" "0" "${gateway}" "${address}"
-	}
-	[ -n "${dns1}" ] && {
-		echo "adding primary DNS at ${dns1}"
-		proto_add_dns_server "${dns1}"
-	}
-	[ -n "${dns2}" ] && {
-		echo "adding secondary DNS at ${dns2}"
-		proto_add_dns_server "${dns2}"
-	}
-	[ -n "$metric" ] && json_add_int metric "${metric}"
-	proto_send_update "${interface}"
-}
-
-modemmanager_connected_method_dhcp_ipv6() {
-	local interface="$1"
-	local wwan="$2"
-	local metric="$3"
-
-	proto_init_update "${wwan}" 1
-	proto_set_keep 1
-	proto_send_update "${interface}"
-
-	json_init
-	json_add_string name "${interface}_6"
-	json_add_string ifname "@${interface}"
-	json_add_string proto "dhcpv6"
-	proto_add_dynamic_defaults
-	json_add_string extendprefix 1 # RFC 7278: Extend an IPv6 /64 Prefix to LAN
-	[ -n "$metric" ] && json_add_int metric "${metric}"
-	json_close_object
-	ubus call network add_dynamic "$(json_dump)"
-}
-
-modemmanager_connected_method_static_ipv6() {
-	local interface="$1"
-	local wwan="$2"
-	local address="$3"
-	local prefix="$4"
-	local gateway="$5"
-	local mtu="$6"
-	local dns1="$7"
-	local dns2="$8"
-	local metric="$9"
-
-	[ -n "${address}" ] || {
-		proto_notify_error "${interface}" ADDRESS_MISSING
-		return
-	}
-
-	[ -n "${prefix}" ] || {
-		proto_notify_error "${interface}" PREFIX_MISSING
-		return
-	}
-
-	[ -n "${mtu}" ] && /sbin/ip link set dev "${wwan}" mtu "${mtu}"
-
-	proto_init_update "${wwan}" 1
-	proto_set_keep 1
-	echo "adding IPv6 address ${address}, prefix ${prefix}"
-	proto_add_ipv6_address "${address}" "128"
-	proto_add_ipv6_prefix "${address}/${prefix}"
-	[ -n "${gateway}" ] && {
-		echo "adding default IPv6 route via ${gateway}"
-		proto_add_ipv6_route "${gateway}" "128"
-		proto_add_ipv6_route "::0" "0" "${gateway}" "" "" "${address}/${prefix}"
-	}
-	[ -n "${dns1}" ] && {
-		echo "adding primary DNS at ${dns1}"
-		proto_add_dns_server "${dns1}"
-	}
-	[ -n "${dns2}" ] && {
-		echo "adding secondary DNS at ${dns2}"
-		proto_add_dns_server "${dns2}"
-	}
-	[ -n "$metric" ] && json_add_int metric "${metric}"
-	proto_send_update "${interface}"
-}
-
-modemmanager_disconnected_method_common() {
-	local interface="$1"
-
-	echo "running disconnection (common)"
-
-	proto_init_update "*" 0
-	proto_send_update "${interface}"
-}
-
-proto_modemmanager_init_config() {
-	available=1
-	no_device=1
-	proto_config_add_string device
-	proto_config_add_string apn
-	proto_config_add_string 'allowedauth:list(string)'
-	proto_config_add_string username
-	proto_config_add_string password
-	proto_config_add_string allowedmode
-	proto_config_add_string preferredmode
-	proto_config_add_string pincode
-	proto_config_add_string iptype
-	proto_config_add_string plmn
-	proto_config_add_int signalrate
-	proto_config_add_boolean lowpower
-	proto_config_add_boolean allow_roaming
-	proto_config_add_defaults
-}
-
-# Append param to the global 'connectargs' variable.
-append_param() {
-	local param="$1"
-
-	[ -z "$param" ] && return
-	[ -z "$connectargs" ] || connectargs="${connectargs},"
-	connectargs="${connectargs}${param}"
-}
-
-modemmanager_set_allowed_mode() {
-	local device="$1"
-	local interface="$2"
-	local allowedmode="$3"
-
-	echo "setting allowed mode to '${allowedmode}'"
-	mmcli --modem="${device}" --set-allowed-modes="${allowedmode}" || {
-		proto_notify_error "${interface}" MM_INVALID_ALLOWED_MODES_LIST
-		proto_block_restart "${interface}"
-		return 1
-	}
-}
-
-modemmanager_set_preferred_mode() {
-	local device="$1"
-	local interface="$2"
-	local allowedmode="$3"
-	local preferredmode="$4"
-
-	[ -z "${preferredmode}" ] && {
-		echo "no preferred mode configured"
-		proto_notify_error "${interface}" MM_NO_PREFERRED_MODE_CONFIGURED
-		proto_block_restart "${interface}"
-		return 1
-	}
-
-	[ -z "${allowedmode}" ] && {
-		echo "no allowed mode configured"
-		proto_notify_error "${interface}" MM_NO_ALLOWED_MODE_CONFIGURED
-		proto_block_restart "${interface}"
-		return 1
-	}
-
-	echo "setting preferred mode to '${preferredmode}' (${allowedmode})"
-	mmcli --modem="${device}" \
-		--set-preferred-mode="${preferredmode}" \
-		--set-allowed-modes="${allowedmode}" || {
-		proto_notify_error "${interface}" MM_FAILED_SETTING_PREFERRED_MODE
-		proto_block_restart "${interface}"
-		return 1
-	}
-}
-
-proto_modemmanager_setup() {
-	local interface="$1"
-
-	local modempath modemstatus bearercount bearerpath connectargs bearerstatus beareriface
-	local bearermethod_ipv4 bearermethod_ipv6 auth cliauth
-	local operatorname operatorid registration accesstech signalquality
-	local allowedmode preferredmode
-
-	local device apn allowedauth username password pincode
-	local iptype plmn metric signalrate allow_roaming
-
-	local address prefix gateway mtu dns1 dns2
-
-	json_get_vars device apn allowedauth username password
-	json_get_vars pincode iptype plmn metric signalrate allow_roaming
-	json_get_vars allowedmode preferredmode
-
-	# validate sysfs path given in config
-	[ -n "${device}" ] || {
-		echo "No device specified"
-		proto_notify_error "${interface}" NO_DEVICE
-		proto_set_available "${interface}" 0
-		return 1
-	}
-
-	# validate that ModemManager is handling the modem at the sysfs path
-	modemstatus=$(mmcli --modem="${device}" --output-keyvalue)
-	modempath=$(modemmanager_get_field "${modemstatus}" "modem.dbus-path")
-	[ -n "${modempath}" ] || {
-		echo "Device not managed by ModemManager"
-		proto_notify_error "${interface}" DEVICE_NOT_MANAGED
-		proto_set_available "${interface}" 0
-		return 1
-	}
-	echo "modem available at ${modempath}"
-
-	[ -z "${allowedmode}" ] || {
-		case "$allowedmode" in
-			"2g")
-				modemmanager_set_allowed_mode "$device" \
-					"$interface" "2g"
-				;;
-			"3g")
-				modemmanager_set_allowed_mode "$device" \
-					"$interface" "3g"
-				;;
-			"4g")
-				modemmanager_set_allowed_mode "$device" \
-					"$interface" "4g"
-				;;
-			"5g")
-				modemmanager_set_allowed_mode "$device" \
-					"$interface" "5g"
-				;;
-			*)
-				modemmanager_set_preferred_mode "$device" \
-					"$interface" "${allowedmode}" "${preferredmode}"
-				;;
-		esac
-		# check error for allowed_mode and preferred_mode function call
-		[ "$?" -ne "0" ] && return 1
-	}
-
-	# always cleanup before attempting a new connection, just in case
-	modemmanager_cleanup_connection "${modemstatus}"
-
-	# if allowedauth list given, build option string
-	for auth in $allowedauth; do
-		cliauth="${cliauth}${cliauth:+|}$auth"
-	done
-
-	# setup connect args; APN mandatory (even if it may be empty)
-	echo "starting connection with apn '${apn}'..."
-	proto_notify_error "${interface}" MM_CONNECT_IN_PROGRESS
-
-	# setup allow-roaming parameter
-	if [ -n "${allow_roaming}" ] && [ "${allow_roaming}" -eq 0 ];then
-		allow_roaming="no"
-	else
-		# allowed unless a user set the opposite
-		allow_roaming="yes"
-	fi
-
-	# Append options to 'connectargs' variable
-	append_param "apn=${apn}"
-	append_param "allow-roaming=${allow_roaming}"
-	append_param "${iptype:+ip-type=${iptype}}"
-	append_param "${plmn:+operator-id=${plmn}}"
-	append_param "${cliauth:+allowed-auth=${cliauth}}"
-	append_param "${username:+user=${username}}"
-	append_param "${password:+password=${password}}"
-	append_param "${pincode:+pin=${pincode}}"
-
-	mmcli --modem="${device}" --timeout 120 --simple-connect="${connectargs}" || {
-		proto_notify_error "${interface}" MM_CONNECT_FAILED
-		proto_block_restart "${interface}"
-		return 1
-	}
-
-	# check if Signal refresh rate is set
-	if [ -n "${signalrate}" ] && [ "${signalrate}" -eq "${signalrate}" ] 2>/dev/null; then
-		echo "setting signal refresh rate to ${signalrate} seconds"
-		mmcli --modem="${device}" --signal-setup="${signalrate}"
-	else
-		echo "signal refresh rate is not set"
-	fi
-
-	# log additional useful information
-	modemstatus=$(mmcli --modem="${device}" --output-keyvalue)
-	operatorname=$(modemmanager_get_field "${modemstatus}" "modem.3gpp.operator-name")
-	[ -n "${operatorname}" ] && echo "network operator name: ${operatorname}"
-	operatorid=$(modemmanager_get_field "${modemstatus}" "modem.3gpp.operator-code")
-	[ -n "${operatorid}" ] && echo "network operator MCCMNC: ${operatorid}"
-	registration=$(modemmanager_get_field "${modemstatus}" "modem.3gpp.registration-state")
-	[ -n "${registration}" ] && echo "registration type: ${registration}"
-	accesstech=$(modemmanager_get_multivalue_field "${modemstatus}" "modem.generic.access-technologies")
-	[ -n "${accesstech}" ] && echo "access technology: ${accesstech}"
-	signalquality=$(modemmanager_get_field "${modemstatus}" "modem.generic.signal-quality.value")
-	[ -n "${signalquality}" ] && echo "signal quality: ${signalquality}%"
-
-	# we won't like it if there are more than one bearers, as that would mean the
-	# user manually created them, and that's unsupported by this proto
-	bearercount=$(modemmanager_get_field "${modemstatus}" "modem.generic.bearers.length")
-	[ -n "${bearercount}" ] && [ "$bearercount" -eq 1 ] || {
-		proto_notify_error "${interface}" INVALID_BEARER_LIST
-		return 1
-	}
-
-	# load connected bearer information
-	bearerpath=$(modemmanager_get_field "${modemstatus}" "modem.generic.bearers.value\[1\]")
-	bearerstatus=$(mmcli --bearer "${bearerpath}" --output-keyvalue)
-
-	# load network interface and method information
-	beareriface=$(modemmanager_get_field "${bearerstatus}" "bearer.status.interface")
-	bearermethod_ipv4=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.method")
-	bearermethod_ipv6=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.method")
-
-	# setup IPv4
-	[ -n "${bearermethod_ipv4}" ] && {
-		echo "IPv4 connection setup required in interface ${interface}: ${bearermethod_ipv4}"
-		case "${bearermethod_ipv4}" in
-		"dhcp")
-			modemmanager_connected_method_dhcp_ipv4 "${interface}" "${beareriface}" "${metric}"
-			;;
-		"static")
-			address=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.address")
-			prefix=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.prefix")
-			gateway=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.gateway")
-			mtu=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.mtu")
-			dns1=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.dns.value\[1\]")
-			dns2=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.dns.value\[2\]")
-			modemmanager_connected_method_static_ipv4 "${interface}" "${beareriface}" "${address}" "${prefix}" "${gateway}" "${mtu}" "${dns1}" "${dns2}" "${metric}"
-			;;
-		"ppp")
-			modemmanager_connected_method_ppp_ipv4 "${interface}" "${beareriface}" "${username}" "${password}" "${allowedauth}"
-			;;
-		*)
-			proto_notify_error "${interface}" UNKNOWN_METHOD
-			return 1
-			;;
-		esac
-	}
-
-	# setup IPv6
-	# note: if using ipv4v6, both IPv4 and IPv6 settings will have the same MTU and metric values reported
-	[ -n "${bearermethod_ipv6}" ] && {
-		echo "IPv6 connection setup required in interface ${interface}: ${bearermethod_ipv6}"
-		case "${bearermethod_ipv6}" in
-		"dhcp")
-			modemmanager_connected_method_dhcp_ipv6 "${interface}" "${beareriface}" "${metric}"
-			;;
-		"static")
-			address=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.address")
-			prefix=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.prefix")
-			gateway=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.gateway")
-			mtu=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.mtu")
-			dns1=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.dns.value\[1\]")
-			dns2=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.dns.value\[2\]")
-			modemmanager_connected_method_static_ipv6 "${interface}" "${beareriface}" "${address}" "${prefix}" "${gateway}" "${mtu}" "${dns1}" "${dns2}" "${metric}"
-			;;
-		"ppp")
-			proto_notify_error "${interface}" "unsupported method"
-			return 1
-			;;
-		*)
-			proto_notify_error "${interface}" UNKNOWN_METHOD
-			return 1
-			;;
-		esac
-	}
-
-	return 0
-}
-
-proto_modemmanager_teardown() {
-	local interface="$1"
-
-	local modemstatus bearerpath errorstring
-	local bearermethod_ipv4 bearermethod_ipv6
-
-	local device lowpower iptype
-	json_get_vars device lowpower iptype
-
-	echo "stopping network"
-
-	# load connected bearer information, just the first one should be ok
-	modemstatus=$(mmcli --modem="${device}" --output-keyvalue)
-	bearerpath=$(modemmanager_get_field "${modemstatus}" "modem.generic.bearers.value\[1\]")
-	[ -n "${bearerpath}" ] || {
-		echo "couldn't load bearer path: disconnecting anyway"
-		mmcli --modem="${device}" --simple-disconnect >/dev/null 2>&1
-		return
-	}
-
-	# load bearer connection methods
-	bearerstatus=$(mmcli --bearer "${bearerpath}" --output-keyvalue)
-	bearermethod_ipv4=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.method")
-	[ -n "${bearermethod_ipv4}" ] &&
-		echo "IPv4 connection teardown required in interface ${interface}: ${bearermethod_ipv4}"
-	bearermethod_ipv6=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.method")
-	[ -n "${bearermethod_ipv6}" ] &&
-		echo "IPv6 connection teardown required in interface ${interface}: ${bearermethod_ipv6}"
-
-	# disconnection handling only requires special treatment in IPv4/PPP
-	[ "${bearermethod_ipv4}" = "ppp" ] && modemmanager_disconnected_method_ppp_ipv4 "${interface}"
-	modemmanager_disconnected_method_common "${interface}"
-
-	# disconnect
-	mmcli --modem="${device}" --simple-disconnect ||
-		proto_notify_error "${interface}" DISCONNECT_FAILED
-
-	# disable
-	mmcli --modem="${device}" --disable
-
-	# low power, only if requested
-	[ "${lowpower:-0}" -lt 1 ] ||
-		mmcli --modem="${device}" --set-power-state-low
-
-	proto_init_update "*" 0
-	proto_send_update "$interface"
-}
-
-[ -n "$INCLUDE_ONLY" ] || {
-	add_protocol modemmanager
-}
--- a/feeds/ucentral/modemmanager/files/usr/sbin/ModemManager-wrapper
+++ b/feeds/ucentral/modemmanager/files/usr/sbin/ModemManager-wrapper
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-trap_with_arg() {
-	func="$1" ; shift
-	for sig ; do
-		# shellcheck disable=SC2064
-		trap "$func $sig" "$sig"
-	done
-}
-
-func_trap() {
-	logger "ModemManager-wrapper[$$]" "Sending signal ${1}..."
-	kill "-${1}" "$CHILD" 2>/dev/null
-}
-
-main() {
-	. /usr/share/ModemManager/modemmanager.common
-
-	trap_with_arg func_trap INT TERM KILL
-
-	mkdir -p "${MODEMMANAGER_RUNDIR}"
-	chmod 0755 "${MODEMMANAGER_RUNDIR}"
-	mm_cleanup_interfaces
-
-	/usr/sbin/ModemManager "$@" 1>/dev/null 2>/dev/null &
-	CHILD="$!"
-
-	mm_report_events_from_cache
-
-	wait "$CHILD"
-}
-
-main "$@"
--- a/feeds/ucentral/ucentral-client/Makefile
+++ b/feeds/ucentral/ucentral-client/Makefile
@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-client
 PKG_RELEASE:=1

 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-client.git
-PKG_MIRROR_HASH:=2e28e0aa61b74851c7daf3634ec34d303a603e881e6c5d1fd76c837dea527582
+PKG_MIRROR_HASH:=7dfeaedf141a6377de2dc6bcd646b1640201f204db42af52777d018700bc991c
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2025-07-08
-PKG_SOURCE_VERSION:=69829f63ea172ce9bd19b7b02073746fe9cf6a52
+PKG_SOURCE_DATE:=2025-06-27
+PKG_SOURCE_VERSION:=08a842d9921196821a19d52b9061db6c428aab3f

 PKG_LICENSE:=BSD-3-Clause
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
--- a/feeds/ucentral/ucentral-client/files/etc/init.d/ucentral
+++ b/feeds/ucentral/ucentral-client/files/etc/init.d/ucentral
@@ -44,15 +44,14 @@ start_service() {

 	server=$(cat /etc/ucentral/gateway.json | jsonfilter -e '@["server"]')
 	port=$(cat /etc/ucentral/gateway.json | jsonfilter -e '@["port"]')
-	[ -n "$server" -a -n "$port" ] || return 0

 	boot_cause=$(cat /tmp/pstore | jsonfilter -e '@["pstore"][-1]'.boot_cause)
 	[ -z $boot_cause ] && boot_cause=coldboot
 	procd_open_instance
 	procd_set_param command "$PROG"
 	[ -n "$serial" ] && procd_append_param command -S $serial
-	procd_append_param command -s $server
-	procd_append_param command -P $port
+	[ -n "$server" ] && procd_append_param command -s $server
+	[ -n "$port" ] && procd_append_param command -P $port
 	[ "$debug" -eq 0 ] || procd_append_param command -d
 	[ "$insecure" -eq 0 ] || procd_append_param command -i
 	[ -z "$(mount | grep 'tmpfs on / type tmpfs')" ] || procd_append_param command -r
--- a/feeds/ucentral/ucentral-event/files/ucentral-event
+++ b/feeds/ucentral/ucentral-event/files/ucentral-event
@@ -280,21 +280,6 @@ handlers = {
 	},

 	vlan_remove: function(notify) {
-		for (let wan in wan_ports) {
-			let msg = {
-				name: wan,
-				vlan: [ `${notify.data.vlan_id}:t` ]
-			};
-			ubus.call('network.interface.up_none', 'remove_device', msg);
-		}
-
-		let msg = {
-			name: notify.data.ifname,
-			'link-ext': true,
-			vlan: [ `${notify.data.vlan_id}:u` ]
-		};
-		ubus.call('network.interface.up_none', 'remove_device', msg);
-
 		if (ratelimit) {
 			let msg = {
 				device: notify.data.ifname,
--- a/feeds/ucentral/ucentral-schema/Makefile
+++ b/feeds/ucentral/ucentral-schema/Makefile
@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-schema
 PKG_RELEASE:=1

 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git
-PKG_MIRROR_HASH:=1ad9f7b5d5d1145e3aed14937eef60d6794d821e0244cc8fa824400d3da47f5a
+PKG_MIRROR_HASH:=66f1a0644ae7bf34ecdf409aea45b152dcbf9bf8bf8b731ac1b8d4077fb42c7b
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2025-07-11
-PKG_SOURCE_VERSION:=5276d0b8b6e83ab57354b0bcbb820de83a91ab88
+PKG_SOURCE_DATE:=2025-07-07
+PKG_SOURCE_VERSION:=50ba97e1d455a6fd82ab95efe986ac156b472305
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause

--- a/patches/0092-ubus-bump-to-latest-HEAD.patch
+++ b/patches/0092-ubus-bump-to-latest-HEAD.patch
@@ -21,7 +21,7 @@ index 82c4dc601a..ea536930ea 100644
 -PKG_MIRROR_HASH:=f4e898eb9207f069652f1767835f6aa9f015df2282d51e50ab57a0c3736f36e3
 +PKG_SOURCE_DATE:=2025-07-02
 +PKG_SOURCE_VERSION:=5952b48e251c0ea76dfce97f129da6f18d889eda
-+PKG_MIRROR_HASH:=3285485a4d9d0e62e4abcfb004d2be0bec7b5ebc564c68030be0c35f0bc223c4
+PKG_MIRROR_HASH:=60edfc101eaa85976d243febc368fc419fe44283bd3a743851a6bc7975e881f0
 PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
 CMAKE_INSTALL:=1
 
--- a/profiles/cig_wf189.yml
+++ b/profiles/cig_wf189.yml
@@ -13,6 +13,4 @@ packages:
  - ipq53xx
  - ftm
  - qca-ssdk-shell
-  - iperf3
-  - sysstat
  - kmod-cig-poe-judgment 
--- a/profiles/cig_wf189h.yml
+++ b/profiles/cig_wf189h.yml
@@ -12,6 +12,4 @@ include:
 packages:
  - ipq53xx
  - qca-ssdk-shell
-  - iperf3
-  - sysstat
  - kmod-cig-poe-judgment 
--- a/profiles/cig_wf189w.yml
+++ b/profiles/cig_wf189w.yml
@@ -12,6 +12,4 @@ include:
 packages:
  - ipq53xx
  - qca-ssdk-shell
-  - iperf3
-  - sysstat
  - kmod-cig-poe-judgment 
--- a/profiles/cig_wf672.yml
+++ b/profiles/cig_wf672.yml
@@ -15,7 +15,6 @@ packages:
  - qca-ssdk-shell
  - iperf3
  - sysstat
-  - cig-device-boot
  - kmod-cig-wifi-mode-sw
  - kmod-input-lsm303agr
  - kmod-rtl8221d-phy
@@ -23,6 +22,3 @@ packages:
  - kmod-hwmon-tmp103
  - kmod-iio-ilps22qs
  - kmod-cig-poe-judgment 
-diffconfig: |
-  CONFIG_BUSYBOX_CUSTOM=y
-  CONFIG_BUSYBOX_CONFIG_STTY=y
--- a/profiles/emplus_wap380c.yml
+++ b/profiles/emplus_wap380c.yml
@@ -1,21 +0,0 @@
---
-profile: emplus_wap380c
-target: ipq807x
-subtarget: generic
-description: Build image for the Emplus WAP380C
-image: bin/targets/ipq807x/generic/openwrt-ipq807x-emplus_wap380c-squashfs-sysupgrade.tar
-feeds:
-  - name: ipq807x
-    path: ../../feeds/ipq807x_v5.4
-include:
-  - ucentral-ap
-packages:
-  - ipq807x
-diffconfig: |
-  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
-  CONFIG_BUSYBOX_CUSTOM=y
-  CONFIG_BUSYBOX_CONFIG_TFTP=y
-  CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_GET=y
-  CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
-  CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-  CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PROGRESS_BAR=y