From 4e8a988a4d3443c8271c34908b6086dfa0d11690 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sun, 23 Apr 2023 08:24:03 +0200 Subject: [PATCH 1/3] Add python3-ellftool package --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4171623cc..73ea5f1b7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: - name: Prepare run: | sudo apt-get update - sudo apt-get install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler + sudo apt-get install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler python3-pyelftools - name: Free disk space run: | df -h From adc1ba3d5d61a502e5eed376f05538561bc33879 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sun, 23 Apr 2023 20:22:30 +0200 Subject: [PATCH 2/3] Should fix #2825 --- openmptcprouter-full/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile index 57aa34c3d..1e011f099 100644 --- a/openmptcprouter-full/Makefile +++ b/openmptcprouter-full/Makefile @@ -82,7 +82,7 @@ MY_DEPENDS := \ luci-app-acl block-mount blockd fstools luci-app-shutdown libwebp luci-proto-gre tcptraceroute luci-proto-mbim kmod-rtl8xxxu kmod-ath9k-htc luci-app-ttyd luci-mod-dashboard (TARGET_x86||TARGET_x86_64):rtl8192eu-firmware kmod-usb2 libustream-openssl (TARGET_x86||TARGET_x86_64):kmod-ixgbevf (TARGET_x86||TARGET_x86_64):kmod-igbvf \ hwinfo (TARGET_x86||TARGET_x86_64):dmidecode luci-app-packet-capture kmod-bonding luci-proto-bonding luci-app-sysupgrade \ luci-theme-openwrt-2020 luci-proto-wireguard luci-app-wireguard kmod-crypto-lib-blake2s (TARGET_x86||TARGET_x86_64):kmod-r8125 TARGET_x86_64:kmod-atlantic \ - (LINUX_5_15||LINUX_6_1):mptcpd (TARGET_x86||TARGET_x86_64):kmod-igc !TARGET_mvebu:kmod-mmc-spi kmod-macsec usbutils + (LINUX_5_15||LINUX_6_1):mptcpd (TARGET_x86||TARGET_x86_64):kmod-igc !TARGET_mvebu:kmod-mmc-spi kmod-macsec usbutils v2ray-core # !TARGET_mvebu:kmod-usb-net-smsc75xx # libnetfilter-conntrack ebtables ebtables-utils ip-full nstat \ From 368534b006903ac51224fd2157155242900ca626 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sun, 23 Apr 2023 20:23:11 +0200 Subject: [PATCH 3/3] Fix #2824 --- mptcp/files/etc/init.d/mptcp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp index b444420f4..f870963e3 100755 --- a/mptcp/files/etc/init.d/mptcp +++ b/mptcp/files/etc/init.d/mptcp @@ -117,19 +117,19 @@ interface_multipath_settings() { config_get mode "$config" multipath id=$metric [ -n "$iface" ] && { - gro=$(uci -q network.${config}.gro) + gro=$(uci -q get network.${config}.gro) [ "$gro" = "1" ] && ethtool -K $iface gro on 2>&1 >/dev/null [ "$gro" = "0" ] && ethtool -K $iface gro on 2>&1 >/dev/null - gso=$(uci -q network.${config}.gso) + gso=$(uci -q get network.${config}.gso) [ "$gso" = "1" ] && ethtool -K $iface gso on 2>&1 >/dev/null [ "$gso" = "0" ] && ethtool -K $iface gso on 2>&1 >/dev/null - lro=$(uci -q network.${config}.lro) + lro=$(uci -q get network.${config}.lro) [ "$lro" = "1" ] && ethtool -K $iface lro on 2>&1 >/dev/null [ "$lro" = "0" ] && ethtool -K $iface lro on 2>&1 >/dev/null - ufo=$(uci -q network.${config}.ufo) + ufo=$(uci -q get network.${config}.ufo) [ "$ufo" = "1" ] && ethtool -K $iface ufo on 2>&1 >/dev/null [ "$ufo" = "0" ] && ethtool -K $iface ufo on 2>&1 >/dev/null - tso=$(uci -q network.${config}.tso) + tso=$(uci -q get network.${config}.tso) [ "$tso" = "1" ] && ethtool -K $iface tso on 2>&1 >/dev/null [ "$tso" = "0" ] && ethtool -K $iface tso on 2>&1 >/dev/null }