Forráskód Böngészése

add conditional sysctl patches for android12-5.10 and android13-5.10

- Comment out BBRv3 patch for android16-6.12
- Add proc_dou8vec_minmax patches for android12-5.10 and android13-5.10
  when the function is not already present
TheWildJames 2 hónapja
szülő
commit
e46f31d097
1 módosított fájl, 8 hozzáadás és 1 törlés
  1. 8 1
      .github/actions/networking/action.yml

+ 8 - 1
.github/actions/networking/action.yml

@@ -100,7 +100,7 @@ runs:
       run: |
         set -euo pipefail
         if [[ ${{ inputs.version }} == "android16-6.12" ]]; then
-          patch -p1 < "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android15-6.6.patch"
+          #patch -p1 < "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android15-6.6.patch"
         elif [[ ${{ inputs.version }} == "android15-6.6" ]]; then
           patch -p1 < "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android15-6.6.patch"
         elif [[ ${{ inputs.version }} == "android14-6.1" ]]; then
@@ -115,6 +115,13 @@ runs:
           patch -p1 < "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android12-5.10.patch"
         fi
 
+        if [[ ${{ inputs.version }} == "android12-5.10" || ${{ inputs.version }} == "android13-5.10" ]]; then
+          if ! grep -qF 'int proc_dou8vec_minmax(' ./include/linux/sysctl.h; then
+            patch -p1 < "${{ github.workspace }}/common/bbrv3/sysctl_add_proc_dou8vec_minmax.patch"
+            patch -p1 < "${{ github.workspace }}/common/bbrv3/sysctl_fix_data-races_in_proc_dou8vec_minmax.patch"
+          fi
+        fi
+
         echo "✅ BBRv3 patches applied"
 
     - name: Enable BBRv3 Kernel Config