[git.ipfire.org] IPFire 2.x development tree branch, master, updated. dbc58c88907c9e38d803ac0c6a2200a364fc3e3f

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. dbc58c88907c9e38d803ac0c6a2200a364fc3e3f

[Michael Tremer]

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, master has been updated
       via  dbc58c88907c9e38d803ac0c6a2200a364fc3e3f (commit)
       via  77d9e3e4c2f3c0f573ac40318950e106755a236d (commit)
       via  fce1c71108c9e3ed2f574fb30ce58d8bcbd342a6 (commit)
      from  9745aa67b3ebdf2b6d4b574a25066fb25d0d0009 (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 dbc58c88907c9e38d803ac0c6a2200a364fc3e3f
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Tue Nov 25 12:33:31 2025 +0100

    core199: Regenerate QoS rules and restart during update
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 77d9e3e4c2f3c0f573ac40318950e106755a236d
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Tue Nov 25 12:31:56 2025 +0100

    hostapd: Read the correct capabilities for the right band
    
    Some modules don't support the same capabilities in the 2.4/5 GHz bands.
    Therefore we need to abort parsing once we have found the correct
    capabilities.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit fce1c71108c9e3ed2f574fb30ce58d8bcbd342a6
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Tue Nov 25 12:24:55 2025 +0100

    hostapd: No longer fetch the device driver
    
    We used to need this for the filtering mechanism which has been removed.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

Summary of changes:
 config/rootfiles/core/199/update.sh |  2 ++
 src/initscripts/packages/hostapd    | 51 ++++++++++++++++++++++---------------
 2 files changed, 32 insertions(+), 21 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/199/update.sh b/config/rootfiles/core/199/update.sh
index 561b7a8ef..90e6060e6 100644
--- a/config/rootfiles/core/199/update.sh
+++ b/config/rootfiles/core/199/update.sh
@@ -141,6 +141,8 @@ sudo -u nobody /srv/web/ipfire/cgi-bin/ovpnmain.cgi
 /etc/init.d/unbound restart
 /etc/init.d/sshd restart
 /etc/init.d/ipsec restart
+/usr/local/bin/qosctrl generate
+/usr/local/bin/qosctrl start
 
 # Re-import the updated crontab
 fcrontab -z
diff --git a/src/initscripts/packages/hostapd b/src/initscripts/packages/hostapd
index 44d697aeb..5384badab 100644
--- a/src/initscripts/packages/hostapd
+++ b/src/initscripts/packages/hostapd
@@ -118,10 +118,6 @@ write_config() {
 	# Fetch the PHY
 	local phy="$(</sys/class/net/${interface}/phy80211/name)"
 
-	# Fetch the driver
-	local driver="$(readlink /sys/class/net/${interface}/device/driver)"
-	driver="${driver##*/}"
-
 	local flag
 	local ht_flags=0
 	local vht_flags=0
@@ -130,10 +126,18 @@ write_config() {
 	local eht_mac_flags=0
 	local eht_phy_flags=0
 
-	local ht_caps=()
-	local vht_caps=()
-	local he_caps=()
-	local eht_caps=()
+	# Set some default BAND if none is set
+	if [ -z "${BAND}" ]; then
+		# Use 2.4 GHz for 802.11g/n and assume 5 GHz for anything else
+		case "${HW_MODE}" in
+			gn)
+				BAND="2g"
+				;;
+			*)
+				BAND="5g"
+				;;
+		esac
+	fi
 
 	# Fetch PHY information
 	local line
@@ -157,9 +161,27 @@ write_config() {
 			"Capabilities: "*)
 				ht_flags="${line:14}"
 				;;
+
+			# Check if we are in the right band
+			"* 2412.0 MHz"*)
+				if [ "${BAND}" = "2g" ]; then
+					break
+				fi
+				;;
+
+			"* 5180.0 MHz"*)
+				if [ "${BAND}" = "5g" ]; then
+					break
+				fi
+				;;
 		esac
 	done <<<"$(iw phy "${phy}" info)"
 
+	local ht_caps=()
+	local vht_caps=()
+	local he_caps=()
+	local eht_caps=()
+
 	# HT Capabilities
 	for flag in ${!HT_CAPS[@]}; do
 		if (( ${ht_flags} & ${flag} )); then
@@ -304,19 +326,6 @@ write_config() {
 		esac
 	fi
 
-	# Set some default BAND if none is set
-	if [ -z "${BAND}" ]; then
-		# Use 2.4 GHz for 802.11g/n and assume 5 GHz for anything else
-		case "${HW_MODE}" in
-			gn)
-				BAND="2g"
-				;;
-			*)
-				BAND="5g"
-				;;
-		esac
-	fi
-
 	# Header
 	echo "# Automatically generated configuration"
 	echo "# DO NOT EDIT"


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