From bb9df8a790091acbec27d421fd6e13192fc7a89e Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Tue, 7 Jan 2025 19:10:24 +0100 Subject: [PATCH] Change overhead value for SQM; improve GH actions --- .github/workflows/ax3000t.yaml | 5 +++-- .github/workflows/bpi-r4-main_router.yaml | 6 +++++- settings-configs/BPI-R4/qosify | 8 ++------ settings-configs/BPI-R4/sqm | 6 +----- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ax3000t.yaml b/.github/workflows/ax3000t.yaml index ce4e692..4b810b2 100644 --- a/.github/workflows/ax3000t.yaml +++ b/.github/workflows/ax3000t.yaml @@ -67,7 +67,7 @@ jobs: run: | curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/mediatek/mt7981b/ax3000t > .config curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/${{ env.ROLE_CONFIG }} >> .config - curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/snapshot-short >> .config + curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/snapshot >> .config - name: Enable openssl run: | @@ -116,7 +116,8 @@ jobs: with: files: bin/targets/mediatek/filogic/* tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.REMOTE_BRANCH }}-${{ env.RELEASE_DATE }} - name: OpenWRT AX3000T ${{ inputs.DEVICE_CONFIG == 'stock' && 'stock layout' || 'u-boot layout' }} - ${{ env.RELEASE_DATE }} + name: | + OpenWRT AX3000T ${{ inputs.DEVICE_CONFIG == 'stock' && 'stock layout' || 'u-boot layout' }} - ${{ env.RELEASE_DATE }} body: | Updated prebuilt images for AX3000T ${{ inputs.DEVICE_CONFIG == 'stock' && 'stock partition layout' || 'u-boot partition layout' }} diff --git a/.github/workflows/bpi-r4-main_router.yaml b/.github/workflows/bpi-r4-main_router.yaml index 1012d4c..5808e4d 100644 --- a/.github/workflows/bpi-r4-main_router.yaml +++ b/.github/workflows/bpi-r4-main_router.yaml @@ -66,13 +66,17 @@ jobs: run: | curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/mediatek/mt7988a/bpi-r4 > .config curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/main-router >> .config - curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/snapshot-short >> .config + curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/snapshot >> .config - name: Enable openssl run: | sed -i '/CONFIG_PACKAGE_wpad-mbedtls=y/d' .config curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/openssl >> .config + - name: Add librespeed-go + run: | + echo "CONFIG_PACKAGE_librespeed-go=y" >> .config + - name: Run defconfig run: | make defconfig diff --git a/settings-configs/BPI-R4/qosify b/settings-configs/BPI-R4/qosify index 5e24d77..71c03d9 100644 --- a/settings-configs/BPI-R4/qosify +++ b/settings-configs/BPI-R4/qosify @@ -40,10 +40,6 @@ config interface wan option nat 1 option host_isolate 1 option autorate_ingress 0 - ### VLAN or PPPoE => overhead is 44 - ### PPPoE (common for DSL or fiber): 40 bytes (18 bytes Ethernet + 8 bytes PPPoE header + 14 bytes other layers) - ### Without VLAN or PPPoE => overhead is 18 - ### MPU set 84 or 64. - option ingress_options "overhead 18 mpu 84" - option egress_options "overhead 18 mpu 84" + option ingress_options "overhead 44 mpu 84" + option egress_options "overhead 44 mpu 84" option options "" diff --git a/settings-configs/BPI-R4/sqm b/settings-configs/BPI-R4/sqm index 95da50e..db70a7d 100644 --- a/settings-configs/BPI-R4/sqm +++ b/settings-configs/BPI-R4/sqm @@ -9,11 +9,7 @@ config queue 'eth1' option linklayer 'ethernet' option debug_logging '0' option verbosity '5' - ### VLAN or PPPoE => overhead is 44 - ### PPPoE (common for DSL or fiber): 40 bytes (18 bytes Ethernet + 8 bytes PPPoE header + 14 bytes other layers) - ### Without VLAN or PPPoE => 18 - ### MPU set 84 or 64. - option overhead '18' + option overhead '44' option linklayer_advanced '1' option tcMTU '2047' option tcTSIZE '128'