git: 1a0146ce027d - main - net/wifi-firmware-*kmod: update firmware for iwlwifi, rtw88, rtw89

From: Bjoern A. Zeeb <bz_at_FreeBSD.org>
Date: Fri, 01 Nov 2024 02:27:55 UTC
The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1a0146ce027d0c4315042d541458fb9831268e48

commit 1a0146ce027d0c4315042d541458fb9831268e48
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2024-10-15 16:46:05 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2024-11-01 02:11:31 +0000

    net/wifi-firmware-*kmod: update firmware for iwlwifi, rtw88, rtw89
    
    The drivers are updated in main.  Add newer supported firmware along
    with it while (manually) keeping some older revisions in some drivers
    for the stable braches.
    
    Sponsored by:   The FreeBSD Foundation
    Reviewed by:    jrm, (cy previous revision)
    Differential Revision: https://reviews.freebsd.org/D47142
---
 net/wifi-firmware-iwlwifi-kmod/Makefile |  22 +++++--
 net/wifi-firmware-iwlwifi-kmod/distinfo | 112 ++++++++++++++++++--------------
 net/wifi-firmware-kmod/Makefile         |   3 +-
 net/wifi-firmware-rtw88-kmod/Makefile   |   8 ++-
 net/wifi-firmware-rtw88-kmod/distinfo   |  38 ++++++-----
 net/wifi-firmware-rtw89-kmod/Makefile   |  15 ++++-
 net/wifi-firmware-rtw89-kmod/distinfo   |  38 ++++++-----
 7 files changed, 148 insertions(+), 88 deletions(-)

diff --git a/net/wifi-firmware-iwlwifi-kmod/Makefile b/net/wifi-firmware-iwlwifi-kmod/Makefile
index e777c2de28e7..d198b1216268 100644
--- a/net/wifi-firmware-iwlwifi-kmod/Makefile
+++ b/net/wifi-firmware-iwlwifi-kmod/Makefile
@@ -2,7 +2,8 @@ BASEDIR=	${.CURDIR}/../wifi-firmware-kmod
 
 FWDRV=		iwlwifi
 FWSUBDIR=
-FWDRV_VERSION=	20240513
+#FWDRV_VERSION=	20240513
+FWDRV_VERSION=	20241017
 
 LICENSE_FILE=	LICENCE.iwlwifi_firmware
 LICENSE_NAME=	Intel firmware license (${FWDRV})
@@ -14,6 +15,10 @@ WHENCE_REGEX=	iwlwifi -.*
 # The flavor/firmware lists below are generated by a script
 # also helping to generate the fwget(8) definitions.
 # { sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh }
+#
+# Note: we manually added (kept) some older versions (outside
+# the generated template) to be able to support all branches.
+#
 ### >>>
 
 FWSUBS= \
@@ -49,10 +54,15 @@ DISTFILES_ax210= \
 	iwlwifi-ma-b0-gf4-a0-89.ucode${DISTURL_SUFFIX} \
 	iwlwifi-ma-b0-gf-a0.pnvm${DISTURL_SUFFIX} \
 	iwlwifi-ma-b0-gf-a0-89.ucode${DISTURL_SUFFIX} \
-	iwlwifi-ma-b0-hr-b0-83.ucode${DISTURL_SUFFIX}
+	iwlwifi-ma-b0-hr-b0-89.ucode${DISTURL_SUFFIX} \
+	iwlwifi-so-a0-gf4-a0.pnvm${DISTURL_SUFFIX} \
+	iwlwifi-so-a0-gf-a0.pnvm${DISTURL_SUFFIX} \
+	iwlwifi-so-a0-gf-a0-89.ucode${DISTURL_SUFFIX} \
+	iwlwifi-so-a0-hr-b0-89.ucode${DISTURL_SUFFIX} \
+	iwlwifi-so-a0-jf-b0-72.ucode${DISTURL_SUFFIX}
 DISTFILES_bz= \
 	iwlwifi-gl-c0-fm-c0.pnvm${DISTURL_SUFFIX} \
-	iwlwifi-gl-c0-fm-c0-83.ucode${DISTURL_SUFFIX}
+	iwlwifi-gl-c0-fm-c0-92.ucode${DISTURL_SUFFIX}
 
 DISTFILES_${FWDRV}= \
 	${DISTFILES_7000} \
@@ -62,7 +72,11 @@ DISTFILES_${FWDRV}= \
 	${DISTFILES_ax210} \
 	${DISTFILES_bz}
 DISTFILES_${FWDRV}_lic=
-
 ### <<<
 
+DISTFILES_ax210+= \
+	iwlwifi-ma-b0-hr-b0-83.ucode${DISTURL_SUFFIX}
+DISTFILES_bz+= \
+	iwlwifi-gl-c0-fm-c0-83.ucode${DISTURL_SUFFIX}
+
 .include "${BASEDIR}/Makefile.inc"
diff --git a/net/wifi-firmware-iwlwifi-kmod/distinfo b/net/wifi-firmware-iwlwifi-kmod/distinfo
index 4163191ef9d3..5037426284b0 100644
--- a/net/wifi-firmware-iwlwifi-kmod/distinfo
+++ b/net/wifi-firmware-iwlwifi-kmod/distinfo
@@ -1,49 +1,63 @@
-TIMESTAMP = 1715893861
-SHA256 (linux-firmware/iwlwififw/iwlwifi-3160-17.ucode?h=20240513) = 0e893c1ed74c3186047508e93442b2d71a07dd5fac00d9dbdb68f34407d7be14
-SIZE (linux-firmware/iwlwififw/iwlwifi-3160-17.ucode?h=20240513) = 918268
-SHA256 (linux-firmware/iwlwififw/iwlwifi-3168-29.ucode?h=20240513) = 3afae7bf4bb5fbb83a895ec7ad097b9fd20b7d8794f405c2823cbea5284e65c3
-SIZE (linux-firmware/iwlwififw/iwlwifi-3168-29.ucode?h=20240513) = 1036288
-SHA256 (linux-firmware/iwlwififw/iwlwifi-7260-17.ucode?h=20240513) = 5d81a6003df0228a497ad27f916ba2c979614b4c439b0f45a5f2873dc0607fe8
-SIZE (linux-firmware/iwlwififw/iwlwifi-7260-17.ucode?h=20240513) = 1049340
-SHA256 (linux-firmware/iwlwififw/iwlwifi-7265D-29.ucode?h=20240513) = f6776a50107cba4f68362b5cf8455f5a0db6a4e8d1e34f4ede6f26803458e25e
-SIZE (linux-firmware/iwlwififw/iwlwifi-7265D-29.ucode?h=20240513) = 1036772
-SHA256 (linux-firmware/iwlwififw/iwlwifi-7265-17.ucode?h=20240513) = 91f699308f102a9ed90217d813bfdb355464ece958a4f8ac96bba5e9d77fe870
-SIZE (linux-firmware/iwlwififw/iwlwifi-7265-17.ucode?h=20240513) = 1180412
-SHA256 (linux-firmware/iwlwififw/iwlwifi-8000C-36.ucode?h=20240513) = a830767818a47b5c51ae3a763fa7a65b03703ce38d3ef5918d8cd7ba82859c64
-SIZE (linux-firmware/iwlwififw/iwlwifi-8000C-36.ucode?h=20240513) = 2428004
-SHA256 (linux-firmware/iwlwififw/iwlwifi-8265-36.ucode?h=20240513) = d7d84c9b6a3b1976acb97a2bec7102e24a6b5d794110c0dcbd107ab5d9877e5f
-SIZE (linux-firmware/iwlwififw/iwlwifi-8265-36.ucode?h=20240513) = 2436632
-SHA256 (linux-firmware/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode?h=20240513) = 9a0c5d938646942f9798e6212579c25771e4bb44301cd409b82abe361ca2c3e0
-SIZE (linux-firmware/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode?h=20240513) = 1519568
-SHA256 (linux-firmware/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode?h=20240513) = 05f4c12514fddfd56fea660b3d2eb6b6e6f4a87a324d5d40464050312ddca911
-SIZE (linux-firmware/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode?h=20240513) = 1490508
-SHA256 (linux-firmware/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode?h=20240513) = 3c2014b78872e04e204e5e8981a1aaf13942ccf198d384ab31f8ebe678ea0121
-SIZE (linux-firmware/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode?h=20240513) = 1406116
-SHA256 (linux-firmware/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode?h=20240513) = 82c5488dc3e52cb6573e989ad478eae70a76240234677265196a35fcbe2f098c
-SIZE (linux-firmware/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode?h=20240513) = 1321956
-SHA256 (linux-firmware/iwlwififw/iwlwifi-Qu-b0-hr-b0-77.ucode?h=20240513) = 1421aa6cec40ac11acc24a76625176b861361e707f93c525d259eeaf0fa808c6
-SIZE (linux-firmware/iwlwififw/iwlwifi-Qu-b0-hr-b0-77.ucode?h=20240513) = 1405980
-SHA256 (linux-firmware/iwlwififw/iwlwifi-Qu-b0-jf-b0-77.ucode?h=20240513) = 5272de5667059f7c4b3f99c77f8c61a0dfd71b4f26954d42cad3df870b5af235
-SIZE (linux-firmware/iwlwififw/iwlwifi-Qu-b0-jf-b0-77.ucode?h=20240513) = 1322684
-SHA256 (linux-firmware/iwlwififw/iwlwifi-Qu-c0-hr-b0-77.ucode?h=20240513) = 95636939981d2d4edf7a40bde3b50a9d887cafc807603d8161ec5e1fdcc55ff8
-SIZE (linux-firmware/iwlwififw/iwlwifi-Qu-c0-hr-b0-77.ucode?h=20240513) = 1405996
-SHA256 (linux-firmware/iwlwififw/iwlwifi-cc-a0-77.ucode?h=20240513) = ce9c6e3bda22003f9a9b97cbca94b8215911b7a146c0f4f017963dbb1a233351
-SIZE (linux-firmware/iwlwififw/iwlwifi-cc-a0-77.ucode?h=20240513) = 1367432
-SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0.pnvm?h=20240513) = 9600ce77fbb9112a35c5876f5bd21831c431bb5b424c8aaa4d0bf3bd7149610f
-SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0.pnvm?h=20240513) = 27820
-SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0-89.ucode?h=20240513) = be29b81db02dc627e0e9591f5ae7c828eab8b39852d6966f46a16b6ecfa7640f
-SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0-89.ucode?h=20240513) = 1598424
-SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf-a0.pnvm?h=20240513) = 10be27ffbb1d7cee9ad7f8fe1cd8d08bc6b8e6fd8bf9913e46dc88f0291c13d8
-SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf-a0.pnvm?h=20240513) = 55096
-SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf-a0-89.ucode?h=20240513) = 92d150a13910e8b741f6cafd3b7caf30c32efea33bb61946fd96bfafe80842ce
-SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf-a0-89.ucode?h=20240513) = 1721440
-SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-hr-b0-83.ucode?h=20240513) = 03b67d28b4916634c544e057abdc46b15b636a85064df993ca431fd92fe4a835
-SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-hr-b0-83.ucode?h=20240513) = 1572104
-SHA256 (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0.pnvm?h=20240513) = f486587db1edde8791665dc27d263d907890fcdf16cc8f8fb254cacd360d4a6e
-SIZE (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0.pnvm?h=20240513) = 267272
-SHA256 (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0-83.ucode?h=20240513) = 1129761b5597077655996ec8590f100766e9d61ec9c331474b4febc6967f0e70
-SIZE (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0-83.ucode?h=20240513) = 1797996
-SHA256 (linux-firmware/iwlwififw/LICENCE.iwlwifi_firmware?h=20240513) = 16d5040c7cf851fc693b7542e20870935b99802533ea1bfd231c377a2305e5c5
-SIZE (linux-firmware/iwlwififw/LICENCE.iwlwifi_firmware?h=20240513) = 2046
-SHA256 (linux-firmware/iwlwififw/WHENCE?h=20240513) = 09453d13d522ce48c11fd37a04bc4a46b88792bc6e51c3b73cdcc5acb364e763
-SIZE (linux-firmware/iwlwififw/WHENCE?h=20240513) = 274394
+TIMESTAMP = 1730331777
+SHA256 (linux-firmware/iwlwififw/iwlwifi-3160-17.ucode?h=20241017) = 0e893c1ed74c3186047508e93442b2d71a07dd5fac00d9dbdb68f34407d7be14
+SIZE (linux-firmware/iwlwififw/iwlwifi-3160-17.ucode?h=20241017) = 918268
+SHA256 (linux-firmware/iwlwififw/iwlwifi-3168-29.ucode?h=20241017) = 3afae7bf4bb5fbb83a895ec7ad097b9fd20b7d8794f405c2823cbea5284e65c3
+SIZE (linux-firmware/iwlwififw/iwlwifi-3168-29.ucode?h=20241017) = 1036288
+SHA256 (linux-firmware/iwlwififw/iwlwifi-7260-17.ucode?h=20241017) = 5d81a6003df0228a497ad27f916ba2c979614b4c439b0f45a5f2873dc0607fe8
+SIZE (linux-firmware/iwlwififw/iwlwifi-7260-17.ucode?h=20241017) = 1049340
+SHA256 (linux-firmware/iwlwififw/iwlwifi-7265D-29.ucode?h=20241017) = f6776a50107cba4f68362b5cf8455f5a0db6a4e8d1e34f4ede6f26803458e25e
+SIZE (linux-firmware/iwlwififw/iwlwifi-7265D-29.ucode?h=20241017) = 1036772
+SHA256 (linux-firmware/iwlwififw/iwlwifi-7265-17.ucode?h=20241017) = 91f699308f102a9ed90217d813bfdb355464ece958a4f8ac96bba5e9d77fe870
+SIZE (linux-firmware/iwlwififw/iwlwifi-7265-17.ucode?h=20241017) = 1180412
+SHA256 (linux-firmware/iwlwififw/iwlwifi-8000C-36.ucode?h=20241017) = a830767818a47b5c51ae3a763fa7a65b03703ce38d3ef5918d8cd7ba82859c64
+SIZE (linux-firmware/iwlwififw/iwlwifi-8000C-36.ucode?h=20241017) = 2428004
+SHA256 (linux-firmware/iwlwififw/iwlwifi-8265-36.ucode?h=20241017) = d7d84c9b6a3b1976acb97a2bec7102e24a6b5d794110c0dcbd107ab5d9877e5f
+SIZE (linux-firmware/iwlwififw/iwlwifi-8265-36.ucode?h=20241017) = 2436632
+SHA256 (linux-firmware/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode?h=20241017) = 9a0c5d938646942f9798e6212579c25771e4bb44301cd409b82abe361ca2c3e0
+SIZE (linux-firmware/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode?h=20241017) = 1519568
+SHA256 (linux-firmware/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode?h=20241017) = 05f4c12514fddfd56fea660b3d2eb6b6e6f4a87a324d5d40464050312ddca911
+SIZE (linux-firmware/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode?h=20241017) = 1490508
+SHA256 (linux-firmware/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode?h=20241017) = c02fea12eb420a15541f8f3bd0e6c75ce4e3656f3ae55efff00580992c41a307
+SIZE (linux-firmware/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode?h=20241017) = 1406124
+SHA256 (linux-firmware/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode?h=20241017) = 1cf6d9036b9d946406737551114701ce29287a79e4142c23df2f0e382685270b
+SIZE (linux-firmware/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode?h=20241017) = 1322828
+SHA256 (linux-firmware/iwlwififw/iwlwifi-Qu-b0-hr-b0-77.ucode?h=20241017) = fb35f94c8c5622af02928203a0113c13db1b9a5608c2d50c04437dd66b0df64c
+SIZE (linux-firmware/iwlwififw/iwlwifi-Qu-b0-hr-b0-77.ucode?h=20241017) = 1405988
+SHA256 (linux-firmware/iwlwififw/iwlwifi-Qu-b0-jf-b0-77.ucode?h=20241017) = 8e4543e684fd0b954e3f5bf47cfbbd022a50ca05a0699ef3c71e975e1465db24
+SIZE (linux-firmware/iwlwififw/iwlwifi-Qu-b0-jf-b0-77.ucode?h=20241017) = 1322744
+SHA256 (linux-firmware/iwlwififw/iwlwifi-Qu-c0-hr-b0-77.ucode?h=20241017) = 243c7fa6c0c4ff379d2d715d872efd5115ca6cc9cfb82c41238646a781d9e536
+SIZE (linux-firmware/iwlwififw/iwlwifi-Qu-c0-hr-b0-77.ucode?h=20241017) = 1406004
+SHA256 (linux-firmware/iwlwififw/iwlwifi-cc-a0-77.ucode?h=20241017) = 945babfcd3cc55ab453445ad1ae6ab15808c567d7ec265ac595eae6936ada003
+SIZE (linux-firmware/iwlwififw/iwlwifi-cc-a0-77.ucode?h=20241017) = 1367504
+SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0.pnvm?h=20241017) = 861385c39a58d1d9a9abfb628ddb0e68e151f8d602ac3c5d55e5fe054124b7c9
+SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0.pnvm?h=20241017) = 27828
+SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0-89.ucode?h=20241017) = b2387f270d23431538d4f6b39bd43d8e0a31cb22660f33d34cb39f4ea6b39727
+SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0-89.ucode?h=20241017) = 1599724
+SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf-a0.pnvm?h=20241017) = 6146aa6b0551d048dc57f149f98f2363ecf2d1e21b75ab944875a857fa5bab48
+SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf-a0.pnvm?h=20241017) = 55112
+SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf-a0-89.ucode?h=20241017) = 7e6aed48d2f0f7728c4981f6ab9c1736e78755bd370fb68784301faaab495687
+SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf-a0-89.ucode?h=20241017) = 1747384
+SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-hr-b0-89.ucode?h=20241017) = efd1e01778db377208439c24bcaf898e1fe3c70785f56187d4fac398fac69d58
+SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-hr-b0-89.ucode?h=20241017) = 1539472
+SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm?h=20241017) = f0b9bfd93a17b03133129b49ac6871d47a51d4d281bf7ecb67b332f6e317fdc2
+SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm?h=20241017) = 27868
+SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm?h=20241017) = 0ea5aeac107c88ff7371188d922fe5337c5060e7e1b4c65053398db798d9c0fd
+SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm?h=20241017) = 55192
+SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-gf-a0-89.ucode?h=20241017) = 6ea5de73b02db47a2f3ad758e2b24d06d7006f23b6d0c9bc4becdd0a0503a154
+SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-gf-a0-89.ucode?h=20241017) = 1739904
+SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-hr-b0-89.ucode?h=20241017) = ac8744414535eda690adec05ea812de15deaaeb9aed575506a9268419a0e0158
+SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-hr-b0-89.ucode?h=20241017) = 1530736
+SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-jf-b0-72.ucode?h=20241017) = bc3a70588ae1563411556e43d23a65ea16f26f5a7fd551169c6c8a2eebf0f832
+SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-jf-b0-72.ucode?h=20241017) = 1406312
+SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-hr-b0-83.ucode?h=20241017) = 03b67d28b4916634c544e057abdc46b15b636a85064df993ca431fd92fe4a835
+SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-hr-b0-83.ucode?h=20241017) = 1572104
+SHA256 (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0.pnvm?h=20241017) = faee96e453d18d9e0433c5490afc8218d22cf02a745f2041c5fa00b35b686a9c
+SIZE (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0.pnvm?h=20241017) = 295004
+SHA256 (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0-92.ucode?h=20241017) = c7092f1f78676f9e9c2c4d12716401db2116b009c5d7c464e8387c5b1c645d6f
+SIZE (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0-92.ucode?h=20241017) = 1913128
+SHA256 (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0-83.ucode?h=20241017) = 1129761b5597077655996ec8590f100766e9d61ec9c331474b4febc6967f0e70
+SIZE (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0-83.ucode?h=20241017) = 1797996
+SHA256 (linux-firmware/iwlwififw/LICENCE.iwlwifi_firmware?h=20241017) = 16d5040c7cf851fc693b7542e20870935b99802533ea1bfd231c377a2305e5c5
+SIZE (linux-firmware/iwlwififw/LICENCE.iwlwifi_firmware?h=20241017) = 2046
+SHA256 (linux-firmware/iwlwififw/WHENCE?h=20241017) = 7851ae8e04d71ccfc741fd2df450ef5724c4a172a0a282f69e8a8ce44877ba84
+SIZE (linux-firmware/iwlwififw/WHENCE?h=20241017) = 291838
diff --git a/net/wifi-firmware-kmod/Makefile b/net/wifi-firmware-kmod/Makefile
index d9ad97ff6457..2557dd66ad13 100644
--- a/net/wifi-firmware-kmod/Makefile
+++ b/net/wifi-firmware-kmod/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wifi-firmware-kmod
-PORTVERSION=	20241001
+PORTVERSION=	20241017
 CATEGORIES=	net
 
 MAINTAINER=	bz@FreeBSD.org
@@ -17,6 +17,7 @@ RUN_DEPENDS=	\
 	wifi-firmware-iwlwifi-kmod-ax210>0:net/wifi-firmware-iwlwifi-kmod@ax210 \
 	wifi-firmware-iwlwifi-kmod-bz>0:net/wifi-firmware-iwlwifi-kmod@bz \
 	\
+	wifi-firmware-rtw88-kmod-rtw8703b>0:net/wifi-firmware-rtw88-kmod@rtw8703b \
 	wifi-firmware-rtw88-kmod-rtw8723d>0:net/wifi-firmware-rtw88-kmod@rtw8723d \
 	wifi-firmware-rtw88-kmod-rtw8821c>0:net/wifi-firmware-rtw88-kmod@rtw8821c \
 	wifi-firmware-rtw88-kmod-rtw8822b>0:net/wifi-firmware-rtw88-kmod@rtw8822b \
diff --git a/net/wifi-firmware-rtw88-kmod/Makefile b/net/wifi-firmware-rtw88-kmod/Makefile
index 608a2752af52..5c855868ae36 100644
--- a/net/wifi-firmware-rtw88-kmod/Makefile
+++ b/net/wifi-firmware-rtw88-kmod/Makefile
@@ -5,7 +5,8 @@ FWSUBDIR=	rtw88
 #FWDRV_VERSION=	20230515	# rtw8822c is barfing
 #FWDRV_VERSION=	20230117	# rtw8822c is barfing
 #FWDRV_VERSION=	20220209	# Used for a long time
-FWDRV_VERSION=	20240513
+#FWDRV_VERSION=	20240513
+FWDRV_VERSION=	20241017
 
 LICENSE_FILE=	LICENCE.rtlwifi_firmware.txt
 LICENSE_NAME=	Realtek firmware license (${FWDRV})
@@ -18,11 +19,15 @@ WHENCE_REGEX=	rtw88 -.*
 ### >>>
 
 FWSUBS= \
+	rtw8703b \
 	rtw8723d \
 	rtw8821c \
 	rtw8822b \
 	rtw8822c
 
+DISTFILES_rtw8703b= \
+	${FWSUBDIR}/rtw8703b_fw.bin${DISTURL_SUFFIX} \
+	${FWSUBDIR}/rtw8703b_wow_fw.bin${DISTURL_SUFFIX}
 DISTFILES_rtw8723d= \
 	${FWSUBDIR}/rtw8723d_fw.bin${DISTURL_SUFFIX}
 DISTFILES_rtw8821c= \
@@ -34,6 +39,7 @@ DISTFILES_rtw8822c= \
 	${FWSUBDIR}/rtw8822c_wow_fw.bin${DISTURL_SUFFIX}
 
 DISTFILES_${FWDRV}= \
+	${DISTFILES_rtw8703b} \
 	${DISTFILES_rtw8723d} \
 	${DISTFILES_rtw8821c} \
 	${DISTFILES_rtw8822b} \
diff --git a/net/wifi-firmware-rtw88-kmod/distinfo b/net/wifi-firmware-rtw88-kmod/distinfo
index ce8e1fb35d3f..2fa8d535f6f6 100644
--- a/net/wifi-firmware-rtw88-kmod/distinfo
+++ b/net/wifi-firmware-rtw88-kmod/distinfo
@@ -1,17 +1,21 @@
-TIMESTAMP = 1715895544
-SHA256 (linux-firmware/rtw88fw/rtw88/rtw8723d_fw.bin?h=20240513) = 9c64e079815a333a3f7b731be7cc0be65206ebc883891659dc8ff5ed36a5e2f5
-SIZE (linux-firmware/rtw88fw/rtw88/rtw8723d_fw.bin?h=20240513) = 28884
-SHA256 (linux-firmware/rtw88fw/rtw88/rtw8821c_fw.bin?h=20240513) = 2ef409bc418549fcf294061dd0cae1fc22fd9da79b60524950b25de18732f3f0
-SIZE (linux-firmware/rtw88fw/rtw88/rtw8821c_fw.bin?h=20240513) = 139472
-SHA256 (linux-firmware/rtw88fw/rtw88/rtw8822b_fw.bin?h=20240513) = 378ff7b43ae7da18a0311175abc351a1758d25ce553b44f3c5694758efbea84c
-SIZE (linux-firmware/rtw88fw/rtw88/rtw8822b_fw.bin?h=20240513) = 150984
-SHA256 (linux-firmware/rtw88fw/rtw88/rtw8822c_fw.bin?h=20240513) = 3deecb31210986d98cdbfb000391e08d602a6eee4ffc883969faa2b907ab03ba
-SIZE (linux-firmware/rtw88fw/rtw88/rtw8822c_fw.bin?h=20240513) = 202600
-SHA256 (linux-firmware/rtw88fw/rtw88/rtw8822c_wow_fw.bin?h=20240513) = 6717fc6ff426a74571ac4f04cd9698fb2f356012c05c58aa64cf21ceb6b958a2
-SIZE (linux-firmware/rtw88fw/rtw88/rtw8822c_wow_fw.bin?h=20240513) = 145224
-SHA256 (linux-firmware/rtw88fw/rtw88/README?h=20240513) = 9718d6d3bc9b1126b826d594f21af2041acb7774a2b4980aa71396b8741f4c48
-SIZE (linux-firmware/rtw88fw/rtw88/README?h=20240513) = 1150
-SHA256 (linux-firmware/rtw88fw/LICENCE.rtlwifi_firmware.txt?h=20240513) = a61351665b4f264f6c631364f85b907d8f8f41f8b369533ef4021765f9f3b62e
-SIZE (linux-firmware/rtw88fw/LICENCE.rtlwifi_firmware.txt?h=20240513) = 2115
-SHA256 (linux-firmware/rtw88fw/WHENCE?h=20240513) = 09453d13d522ce48c11fd37a04bc4a46b88792bc6e51c3b73cdcc5acb364e763
-SIZE (linux-firmware/rtw88fw/WHENCE?h=20240513) = 274394
+TIMESTAMP = 1730331931
+SHA256 (linux-firmware/rtw88fw/rtw88/rtw8703b_fw.bin?h=20241017) = 5e32bd891c74a0719c871726b74490cf5e1a05cdcefb8fe2414f80fffdeb9f9d
+SIZE (linux-firmware/rtw88fw/rtw88/rtw8703b_fw.bin?h=20241017) = 20290
+SHA256 (linux-firmware/rtw88fw/rtw88/rtw8703b_wow_fw.bin?h=20241017) = 7156b0d2b4580e63d11a3a78258c35ff28e840c7c6428953920ae6a1cd5d05ac
+SIZE (linux-firmware/rtw88fw/rtw88/rtw8703b_wow_fw.bin?h=20241017) = 23074
+SHA256 (linux-firmware/rtw88fw/rtw88/rtw8723d_fw.bin?h=20241017) = 9c64e079815a333a3f7b731be7cc0be65206ebc883891659dc8ff5ed36a5e2f5
+SIZE (linux-firmware/rtw88fw/rtw88/rtw8723d_fw.bin?h=20241017) = 28884
+SHA256 (linux-firmware/rtw88fw/rtw88/rtw8821c_fw.bin?h=20241017) = 2ef409bc418549fcf294061dd0cae1fc22fd9da79b60524950b25de18732f3f0
+SIZE (linux-firmware/rtw88fw/rtw88/rtw8821c_fw.bin?h=20241017) = 139472
+SHA256 (linux-firmware/rtw88fw/rtw88/rtw8822b_fw.bin?h=20241017) = 378ff7b43ae7da18a0311175abc351a1758d25ce553b44f3c5694758efbea84c
+SIZE (linux-firmware/rtw88fw/rtw88/rtw8822b_fw.bin?h=20241017) = 150984
+SHA256 (linux-firmware/rtw88fw/rtw88/rtw8822c_fw.bin?h=20241017) = 3deecb31210986d98cdbfb000391e08d602a6eee4ffc883969faa2b907ab03ba
+SIZE (linux-firmware/rtw88fw/rtw88/rtw8822c_fw.bin?h=20241017) = 202600
+SHA256 (linux-firmware/rtw88fw/rtw88/rtw8822c_wow_fw.bin?h=20241017) = 6717fc6ff426a74571ac4f04cd9698fb2f356012c05c58aa64cf21ceb6b958a2
+SIZE (linux-firmware/rtw88fw/rtw88/rtw8822c_wow_fw.bin?h=20241017) = 145224
+SHA256 (linux-firmware/rtw88fw/rtw88/README?h=20241017) = 39c44c710469c1069305add9889921b42704a83f11b94c6d88b06dc2efe40686
+SIZE (linux-firmware/rtw88fw/rtw88/README?h=20241017) = 1181
+SHA256 (linux-firmware/rtw88fw/LICENCE.rtlwifi_firmware.txt?h=20241017) = a61351665b4f264f6c631364f85b907d8f8f41f8b369533ef4021765f9f3b62e
+SIZE (linux-firmware/rtw88fw/LICENCE.rtlwifi_firmware.txt?h=20241017) = 2115
+SHA256 (linux-firmware/rtw88fw/WHENCE?h=20241017) = 7851ae8e04d71ccfc741fd2df450ef5724c4a172a0a282f69e8a8ce44877ba84
+SIZE (linux-firmware/rtw88fw/WHENCE?h=20241017) = 291838
diff --git a/net/wifi-firmware-rtw89-kmod/Makefile b/net/wifi-firmware-rtw89-kmod/Makefile
index 636dfb27c621..83e77567b43b 100644
--- a/net/wifi-firmware-rtw89-kmod/Makefile
+++ b/net/wifi-firmware-rtw89-kmod/Makefile
@@ -2,7 +2,8 @@ BASEDIR=	${.CURDIR}/../wifi-firmware-kmod
 
 FWDRV=		rtw89
 FWSUBDIR=	rtw89
-FWDRV_VERSION=	20240513
+#FWDRV_VERSION=	20240513
+FWDRV_VERSION=	20241017
 
 LICENSE_FILE=	LICENCE.rtlwifi_firmware.txt
 LICENSE_NAME=	Realtek firmware license (${FWDRV})
@@ -12,6 +13,10 @@ WHENCE_REGEX=	rtw89 -.*
 # The flavor/firmware lists below are generated by a script
 # also helping to generate the fwget(8) definitions.
 # { sys/contrib/dev/rtw89/zzz_fw_ports_fwget.sh }
+#
+# Note: we manually added (kept) some -<n> versions (outside
+# the generated template) to be able to support all branches.
+#
 ### >>>
 
 FWSUBS= \
@@ -40,6 +45,14 @@ DISTFILES_${FWDRV}= \
 	${DISTFILES_rtw8922a}
 
 ### <<<<
+DISTFILES_rtw8852a+= \
+	${FWSUBDIR}/rtw8852b_fw.bin${DISTURL_SUFFIX}
+DISTFILES_rtw8852c+= \
+	${FWSUBDIR}/rtw8852c_fw-1.bin${DISTURL_SUFFIX}
+DISTFILES_rtw8922a+= \
+	${FWSUBDIR}/rtw8922a_fw-1.bin${DISTURL_SUFFIX} \
+	${FWSUBDIR}/rtw8922a_fw-2.bin${DISTURL_SUFFIX}
+
 DISTFILES_${FWDRV}_lic=
 
 .include "${BASEDIR}/Makefile.inc"
diff --git a/net/wifi-firmware-rtw89-kmod/distinfo b/net/wifi-firmware-rtw89-kmod/distinfo
index 42fbb4bd8a22..de181c59be7e 100644
--- a/net/wifi-firmware-rtw89-kmod/distinfo
+++ b/net/wifi-firmware-rtw89-kmod/distinfo
@@ -1,15 +1,23 @@
-TIMESTAMP = 1715895554
-SHA256 (linux-firmware/rtw89fw/rtw89/rtw8851b_fw.bin?h=20240513) = f0980b436211f08682666777161db844f020c7c01f4d5864792f9ad8ee2ffd0a
-SIZE (linux-firmware/rtw89fw/rtw89/rtw8851b_fw.bin?h=20240513) = 1162024
-SHA256 (linux-firmware/rtw89fw/rtw89/rtw8852a_fw.bin?h=20240513) = c3dc625eefc631280e3e3359514a71ecb99c5c6a3bc768f127e8e00d8f26db85
-SIZE (linux-firmware/rtw89fw/rtw89/rtw8852a_fw.bin?h=20240513) = 1423232
-SHA256 (linux-firmware/rtw89fw/rtw89/rtw8852b_fw-1.bin?h=20240513) = 2dc9f2fb587219ddace6120c4bf0543e4918ee0396b60ee8d0a6dcd690fb4b12
-SIZE (linux-firmware/rtw89fw/rtw89/rtw8852b_fw-1.bin?h=20240513) = 1242808
-SHA256 (linux-firmware/rtw89fw/rtw89/rtw8852c_fw.bin?h=20240513) = e05e704911ec5d6523e2951416290cc2189444d48a0420e637de6acf5bf21228
-SIZE (linux-firmware/rtw89fw/rtw89/rtw8852c_fw.bin?h=20240513) = 1532656
-SHA256 (linux-firmware/rtw89fw/rtw89/rtw8922a_fw.bin?h=20240513) = 84458f2fa7c9a730fae242d858a82814141421d66a1f672a10121982513daf6d
-SIZE (linux-firmware/rtw89fw/rtw89/rtw8922a_fw.bin?h=20240513) = 1537690
-SHA256 (linux-firmware/rtw89fw/LICENCE.rtlwifi_firmware.txt?h=20240513) = a61351665b4f264f6c631364f85b907d8f8f41f8b369533ef4021765f9f3b62e
-SIZE (linux-firmware/rtw89fw/LICENCE.rtlwifi_firmware.txt?h=20240513) = 2115
-SHA256 (linux-firmware/rtw89fw/WHENCE?h=20240513) = 09453d13d522ce48c11fd37a04bc4a46b88792bc6e51c3b73cdcc5acb364e763
-SIZE (linux-firmware/rtw89fw/WHENCE?h=20240513) = 274394
+TIMESTAMP = 1730332180
+SHA256 (linux-firmware/rtw89fw/rtw89/rtw8851b_fw.bin?h=20241017) = f0980b436211f08682666777161db844f020c7c01f4d5864792f9ad8ee2ffd0a
+SIZE (linux-firmware/rtw89fw/rtw89/rtw8851b_fw.bin?h=20241017) = 1162024
+SHA256 (linux-firmware/rtw89fw/rtw89/rtw8852a_fw.bin?h=20241017) = c3dc625eefc631280e3e3359514a71ecb99c5c6a3bc768f127e8e00d8f26db85
+SIZE (linux-firmware/rtw89fw/rtw89/rtw8852a_fw.bin?h=20241017) = 1423232
+SHA256 (linux-firmware/rtw89fw/rtw89/rtw8852b_fw.bin?h=20241017) = 5b9c224ae014e0aeade8701412d820e213c8880e08615b3905dba89659f21baf
+SIZE (linux-firmware/rtw89fw/rtw89/rtw8852b_fw.bin?h=20241017) = 1035232
+SHA256 (linux-firmware/rtw89fw/rtw89/rtw8852b_fw-1.bin?h=20241017) = 2dc9f2fb587219ddace6120c4bf0543e4918ee0396b60ee8d0a6dcd690fb4b12
+SIZE (linux-firmware/rtw89fw/rtw89/rtw8852b_fw-1.bin?h=20241017) = 1242808
+SHA256 (linux-firmware/rtw89fw/rtw89/rtw8852c_fw.bin?h=20241017) = e05e704911ec5d6523e2951416290cc2189444d48a0420e637de6acf5bf21228
+SIZE (linux-firmware/rtw89fw/rtw89/rtw8852c_fw.bin?h=20241017) = 1532656
+SHA256 (linux-firmware/rtw89fw/rtw89/rtw8852c_fw-1.bin?h=20241017) = 3b7a3f2781ade68997756d3278b2656e454f1230e02620871e97fbf8071d1b7d
+SIZE (linux-firmware/rtw89fw/rtw89/rtw8852c_fw-1.bin?h=20241017) = 2180616
+SHA256 (linux-firmware/rtw89fw/rtw89/rtw8922a_fw.bin?h=20241017) = 84458f2fa7c9a730fae242d858a82814141421d66a1f672a10121982513daf6d
+SIZE (linux-firmware/rtw89fw/rtw89/rtw8922a_fw.bin?h=20241017) = 1537690
+SHA256 (linux-firmware/rtw89fw/rtw89/rtw8922a_fw-1.bin?h=20241017) = 4340bc322912f30f1793bb57a1747c23b15e40db2df628d6687d1ddf722f2828
+SIZE (linux-firmware/rtw89fw/rtw89/rtw8922a_fw-1.bin?h=20241017) = 1583434
+SHA256 (linux-firmware/rtw89fw/rtw89/rtw8922a_fw-2.bin?h=20241017) = 9ca08cd3098b954cc0d44edd5c0b079877e5dd9b98d55cfec1c302b41475d88c
+SIZE (linux-firmware/rtw89fw/rtw89/rtw8922a_fw-2.bin?h=20241017) = 1586954
+SHA256 (linux-firmware/rtw89fw/LICENCE.rtlwifi_firmware.txt?h=20241017) = a61351665b4f264f6c631364f85b907d8f8f41f8b369533ef4021765f9f3b62e
+SIZE (linux-firmware/rtw89fw/LICENCE.rtlwifi_firmware.txt?h=20241017) = 2115
+SHA256 (linux-firmware/rtw89fw/WHENCE?h=20241017) = 7851ae8e04d71ccfc741fd2df450ef5724c4a172a0a282f69e8a8ce44877ba84
+SIZE (linux-firmware/rtw89fw/WHENCE?h=20241017) = 291838