TheWildJames 2 месяцев назад
Родитель
Сommit
e5d06da950
1 измененных файлов с 10 добавлено и 5 удалено
  1. 10 5
      .github/actions/networking/action.yml

+ 10 - 5
.github/actions/networking/action.yml

@@ -16,19 +16,22 @@ runs:
   steps:
     - name: 'Apply BBRv3'
       shell: bash
-      if: false
       working-directory: ${{ github.workspace }}/kernel/common
       run: |
         set -euo pipefail
-        cp ${{ github.action_path }}/patches/bbrv3.patch "${{ github.workspace }}/kernel/common/bbrv3.patch"
-        patch -p1 < bbrv3.patch
+        PATCH_URL="https://raw.githubusercontent.com/fatalcoder524/kernel_patches_additional/refs/heads/main/bbr3/0001-net-tcp-backport-BBRv3-to-$ANDROID_VER-$KERNEL_VER.patch"
+        if curl -f -Ls "$PATCH_URL" -o temp.patch; then
+          patch -p1 -F 3 < temp.patch
+          rm temp.patch
+        fi
+        
+        echo "✅ BBRv3 patches applied"
 
     - name: Enable Kernel Configs
       uses: ./.github/actions/set-kernel-config
-      if: false
       with:
         config_list: |
-          CONFIG_TCP_CONG_BBRV3=y
+          CONFIG_TCP_CONG_BBR3=y
 
     - name: Enable Kernel Configs
       uses: ./.github/actions/set-kernel-config
@@ -73,6 +76,8 @@ runs:
           CONFIG_DEFAULT_TCP_CONG="bbr"
           CONFIG_NET_SCH_FQ=y
           CONFIG_NET_SCH_FQ_CODEL=y
+          CONFIG_NET_ACT_CONNMARK=y
+          CONFIG_NET_SCH_CAKE=y
         
     - name: Apply Kernel Config for 5.10
       shell: bash