From 050dcc872be0792cca9fc35f05eeabbfb0e0723f Mon Sep 17 00:00:00 2001 From: padavanonly Date: Sat, 6 Jan 2024 11:49:17 +0800 Subject: [PATCH] sync --- .../root/usr/share/luci/menu.d/luci-app-eqos.json | 2 +- package/mtk/applications/switch/files/switch_ctl.init | 4 ++-- package/network/services/dnsmasq/files/dhcp.conf | 2 +- .../drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/mtk/applications/luci-app-eqos-mtk/root/usr/share/luci/menu.d/luci-app-eqos.json b/package/mtk/applications/luci-app-eqos-mtk/root/usr/share/luci/menu.d/luci-app-eqos.json index 1c0994b787..ef9345ffed 100644 --- a/package/mtk/applications/luci-app-eqos-mtk/root/usr/share/luci/menu.d/luci-app-eqos.json +++ b/package/mtk/applications/luci-app-eqos-mtk/root/usr/share/luci/menu.d/luci-app-eqos.json @@ -1,5 +1,5 @@ { - "admin/services/eqos": { + "admin/newtwork/eqos": { "title": "EQoS", "action": { "type": "view", diff --git a/package/mtk/applications/switch/files/switch_ctl.init b/package/mtk/applications/switch/files/switch_ctl.init index eab3b660fa..63b8b010c0 100644 --- a/package/mtk/applications/switch/files/switch_ctl.init +++ b/package/mtk/applications/switch/files/switch_ctl.init @@ -1,6 +1,6 @@ #!/bin/sh /etc/rc.common -START=99 +START=25 USE_PROCD=1 service_triggers() { @@ -11,6 +11,6 @@ start_service() { logger -t "switch_ctl" "restart mt753x all ports" source "/usr/sbin/switch_ctl.sh" sw_poweroff_ports "0 1 2 3 4" - sleep 3 + sleep 2 sw_poweron_ports "0 1 2 3 4" } diff --git a/package/network/services/dnsmasq/files/dhcp.conf b/package/network/services/dnsmasq/files/dhcp.conf index a5f833e470..9eea0150c5 100644 --- a/package/network/services/dnsmasq/files/dhcp.conf +++ b/package/network/services/dnsmasq/files/dhcp.conf @@ -31,7 +31,7 @@ config dhcp lan option start 100 option limit 150 option leasetime 12h - + option force 1 config dhcp wan option interface wan option ignore 1 diff --git a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c index 4e9e854080..7e6c26f226 100644 --- a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c +++ b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c @@ -2166,6 +2166,8 @@ static void mtk_hnat_nf_update(struct sk_buff *skb) counter = acct->counter; atomic64_add(diff.packets, &counter[CTINFO2DIR(ctinfo)].packets); atomic64_add(diff.bytes, &counter[CTINFO2DIR(ctinfo)].bytes); + atomic64_set(&counter[CTINFO2DIR(ctinfo)].diff_packets, diff.packets); + atomic64_set(&counter[CTINFO2DIR(ctinfo)].diff_bytes, diff.bytes); } } }