[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9287c6c9c770eee3838f6ed0c31efa36489de9c2

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 3786 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  9287c6c9c770eee3838f6ed0c31efa36489de9c2 (commit)
       via  58846b68b47c43470134d700d00b1ea90b795325 (commit)
      from  bd4e688e648dfd58392968b0a261133e62e581f7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9287c6c9c770eee3838f6ed0c31efa36489de9c2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Aug 19 18:17:12 2024 +0000

    core188: Ship the network AQM script
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 58846b68b47c43470134d700d00b1ea90b795325
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Aug 19 19:13:19 2024 +0100

    AQM: Revert back to only use fq_codel by default
    
    We have defaulted to CAKE for all devices that quality. That has however
    resulted in worse network quality as some devices could not provide the
    compute power necessary for CAKE. There are however only very few
    benefits to run an unconfigured CAKE.
    
    This patch changes this back to fq_codel which is computationally
    cheaper and should deliver 99% of the throughput that CAKE does. This is
    presumably the better trade-off.
    
    We don't use fq_codel on wireless devices since the kernel is running
    this for each client. It would have been nice to only apply this to
    wireless interfaces in AP mode, but I cannot find a way to tell the
    difference with asking NETLINK.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/188/filelists/files |  1 +
 config/udev/network-aqm                   | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/188/filelists/files b/config/rootfiles/core/188/filelists/files
index f9a32d256..702deefc1 100644
--- a/config/rootfiles/core/188/filelists/files
+++ b/config/rootfiles/core/188/filelists/files
@@ -3,6 +3,7 @@ etc/rc.d/init.d/functions
 etc/rc.d/init.d/networking/functions.network
 etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/suricata
+lib/udev/network-aqm
 lib/udev/network-hotplug-vlan
 srv/web/ipfire/cgi-bin/dhcp.cgi
 srv/web/ipfire/cgi-bin/services.cgi
diff --git a/config/udev/network-aqm b/config/udev/network-aqm
index a11fc5c50..36355cfc6 100644
--- a/config/udev/network-aqm
+++ b/config/udev/network-aqm
@@ -39,6 +39,10 @@ case "${ACTION}" in
 		# Detect bridges
 		if [ -d "/sys/class/net/${INTERFACE}/bridge" ]; then
 			TYPE="bridge"
+
+		# Detect wireless interfaces
+		elif [ -d "/sys/class/net/${INTERFACE}/phy80211" ]; then
+			TYPE="wireless"
 		fi
 
 		args=()
@@ -65,6 +69,11 @@ case "${ACTION}" in
 				exit 0
 				;;
 
+			# Ignore wireless interfaces
+			*,wireless)
+				exit 0
+				;;
+
 			# Ignore IMQ/IFB
 			imq*,*|ifb*,*)
 				exit 0
@@ -75,14 +84,9 @@ case "${ACTION}" in
 				args+=( "cake" "internet" "conservative" "ack-filter" )
 				;;
 
-			# Treat any other interfaces as "Ethernet"
-			red*,*)
-				args+=( "cake" "internet" "ethernet" )
-				;;
-
 			# All other interfaces are locally connected
 			*)
-				args+=( "cake" "ethernet" "metro" )
+				args+=( "fq_codel" )
 				;;
 		esac
 


hooks/post-receive
--
IPFire 2.x development tree