linux-cachyos-rc: Use cubic as default TCP congestion control

Signed-off-by: Eric Naim <[email protected]>
CachyOS · Dec 9, 2024 · b3325d2 · b3325d2
1 parent 8fb665e
commit b3325d2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/linux-cachyos-rc/.SRCINFO b/linux-cachyos-rc/.SRCINFO
@@ -28,7 +28,7 @@ pkgbase = linux-cachyos-rc
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.13/misc/dkms-clang.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.13/sched/0001-bore-cachy.patch
 	b2sums = 58c0a37b87c906c4c151a714ad69fdb019a64efcceb7eec52335270e592d1db031eb371086405efb19d9a18ab06c722c98d936669183900d5c2785de6e4caa2c
-	b2sums = ec86c7024cf1b209c217d10d0f3db0052871308177d4e56922bf1629cecee2a5dfef3c456cec55d566afcfd915e631fba9b26fa2ebacf829f000944060c41210
+	b2sums = 8f49a29130454356d996901b3328169dd4abe717092cdd7c73574f8626ba0e034a05fb672cf39395609d1f6a9bc2db3686d4eecdc41b2542572b01563b2f9272
 	b2sums = 390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab
 	b2sums = d4e154bf7dcdf18ef986a745807cfb8437dc11ec5af399c0b355d29fb5500f8e403d582e95183fa564a3ffa0daece78af935999086406d7851b79fcf20ce70fd
 	b2sums = c7294a689f70b2a44b0c4e9f00c61dbd59dd7063ecbe18655c4e7f12e21ed7c5bb4f5169f5aa8623b1c59de7b2667facb024913ecb9f4c650dabce4e8a7e5452

diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
@@ -67,7 +67,7 @@ _cc_harder=${_cc_harder-y}
 _per_gov=${_per_gov-}
 
 ### Enable TCP_CONG_BBR3
-_tcp_bbr3=${_tcp_bbr3-y}
+_tcp_bbr3=${_tcp_bbr3-}
 
 ### Running with a 1000HZ, 750Hz, 625Hz, 600 Hz, 500Hz, 300Hz, 250Hz and 100Hz tick rate
 _HZ_ticks=${_HZ_ticks-1000}
@@ -801,7 +801,7 @@ for _p in "${pkgname[@]}"; do
 done
 
 b2sums=('58c0a37b87c906c4c151a714ad69fdb019a64efcceb7eec52335270e592d1db031eb371086405efb19d9a18ab06c722c98d936669183900d5c2785de6e4caa2c'
-        'ec86c7024cf1b209c217d10d0f3db0052871308177d4e56922bf1629cecee2a5dfef3c456cec55d566afcfd915e631fba9b26fa2ebacf829f000944060c41210'
+        '8f49a29130454356d996901b3328169dd4abe717092cdd7c73574f8626ba0e034a05fb672cf39395609d1f6a9bc2db3686d4eecdc41b2542572b01563b2f9272'
         '390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab'
         'd4e154bf7dcdf18ef986a745807cfb8437dc11ec5af399c0b355d29fb5500f8e403d582e95183fa564a3ffa0daece78af935999086406d7851b79fcf20ce70fd'
         'c7294a689f70b2a44b0c4e9f00c61dbd59dd7063ecbe18655c4e7f12e21ed7c5bb4f5169f5aa8623b1c59de7b2667facb024913ecb9f4c650dabce4e8a7e5452'

diff --git a/linux-cachyos-rc/config b/linux-cachyos-rc/config
@@ -1438,7 +1438,7 @@ CONFIG_INET_RAW_DIAG=m
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_CONG_HTCP=m
 CONFIG_TCP_CONG_HSTCP=m
@@ -1452,10 +1452,10 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_CONG_DCTCP=m
 CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=y
-CONFIG_DEFAULT_BBR=y
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="bbr"
+CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_SIGPOOL=y
 CONFIG_TCP_AO=y
 CONFIG_TCP_MD5SIG=y
@@ -1975,23 +1975,23 @@ CONFIG_NET_SCH_SKBPRIO=m
 CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
 CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_CAKE=m
-CONFIG_NET_SCH_FQ=y
+CONFIG_NET_SCH_FQ=m
 CONFIG_NET_SCH_HHF=m
 CONFIG_NET_SCH_PIE=m
 CONFIG_NET_SCH_FQ_PIE=m
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_SCH_PLUG=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_DEFAULT=y
-CONFIG_DEFAULT_FQ=y
+# CONFIG_DEFAULT_FQ is not set
 # CONFIG_DEFAULT_CODEL is not set
-# CONFIG_DEFAULT_FQ_CODEL is not set
+CONFIG_DEFAULT_FQ_CODEL=y
 # CONFIG_DEFAULT_FQ_PIE is not set
 # CONFIG_DEFAULT_SFQ is not set
 # CONFIG_DEFAULT_PFIFO_FAST is not set
-CONFIG_DEFAULT_NET_SCH="fq"
+CONFIG_DEFAULT_NET_SCH="fq_codel"
 
 #
 # Classification