gentoo auto-resync : 24:02:2025 - 19:24:56

20 files changed, 148 insertions, 100 deletions

diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index 47a9926bcc15..d68b0c65e737 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -1,22 +1,25 @@
-AUX 001-null-pointer-fix.patch 1270 BLAKE2B 41191fefabfd4bb5d1feaecefaf0f836e68b1190e420b54a7b5155a1ffea645c34740dc0fbc0ae60a2dac448e9e412c0c22b824f18aded70f685a2efa58c130e SHA512 885a3677304e900aeb624dbe50b5c2102d17da64551a0a4108a1da31ccc59b9349b3ba1344d4da9c0342c34927e40457105a542a74d51818301c65843f19ce9e
-AUX 002-rdtscl.patch 786 BLAKE2B bbc80e1ac01683ccc2d940212347fc11c74bdc252d492ca79a292015ac25df6a153ac97cb6c0f0a8d51c1c33d5dc0de4fdd61b1958499b946dc817d29646b72f SHA512 b483a4fd5fbb5a4697365b6ddcd8034b4d90ddee9bf2aecf003b0fd6838a708d3e84be33b08acdbe165d440480da25fdf0dfff0d2fe12fa2c5271c51d6ac74c0
-AUX 003-linux47.patch 3897 BLAKE2B ecf3eb75f8eb3331b0a36b39851536de43cffd3b303db9e9f4fe6fe55d463c3343aba17a99668448427764a719e15e3e862d6a3dc0bc61cb68da9934fb427c6f SHA512 f61ecfb6b8c5a377c7a4da7549c9ec75677782fa2f97e64de0df1259e0ec3b993cfa3eaa4ff50331703ee18ef28f2af0d09839dd3b63ed994e6b29cbfe8ed73f
-AUX 004-linux48.patch 1835 BLAKE2B 7e091ac44616ea4cfa80b3a5563f4c6a235d2431b911f6bc52074a76b2c1d609dc546430f048abf042f862907f573c6b1dfa24c8c424aeefe73ff13ae3f34900 SHA512 e5959921b6f0cd5d61d7ed568f549b0920f394458c28257c05064b89d7067ce11c8e44ed0e5a48a65bd041c6193d9ae2d02fca2f5efbfb787d3f9001786a4578
+AUX 001-null-pointer-fix.patch 1027 BLAKE2B 4ac6a744814f8151082c991f32bb53c50ad17aec30b5418f201d6abb4860fb9ba22f856888d3b0cb2241cd8bb80daaf04d4011b0f324edf6d95ec79b7381c949 SHA512 5002709d99e0a5c1ef9fd50ceff4084da83643406e5b50dc44b21d723016adffa976d7f808236fc23704457921adcad0c15abd740abd3d4603472345524f00e9
+AUX 002-rdtscl.patch 655 BLAKE2B 78080155ef2c28150f19470fae945e2a8da58f829dba8d0b6b148420e805e8cf87c0cc5a2ade6d29b63c7ec4531bd89883748814d5bae73f57b6cb8ce8800112 SHA512 56c43d1c76bce21dd98fa405009b448a586823a383b977c6617b4e9d700ace2a7f15ba09dac57ab4f0bb364041e87526b39c6783bd62f87288078a521c40c313
+AUX 003-linux47.patch 3825 BLAKE2B 7d188853d437809f63b5cf7b144b8f6f5b06b8fee827d3613eb82bb6fb82ea339875b89e1110cba566f9d52a850aec239bca988bd22dc5f7c0fab8347eee57cf SHA512 4b5460a18f4020a5e5e81daa779c15b360b4a801f8d1fd200f09eca6b5190754276c0ce9f92a26f336c3677cd58f5cd8578c4a7b61b46a1b653c27907c2c875f
+AUX 004-linux48.patch 1626 BLAKE2B 9fb2fec1197919543d5a94be404b55cc40651a484ba9ef731a438d8d4c8fe4ab570d2ad3c5d73ffca27254542730980f90b2fabb3779f40ea61912e4d6a72745 SHA512 d3a2d4de8c4a269c190901fdce9b4eab8248d921b932e9970e627af4f7b62e7d10cb784919aad439c2b8cec6ab01944874f02d4788ad0ccf2fac67f2f610410f
 AUX 005-debian-fix-kernel-warnings.patch 5013 BLAKE2B 3b65cccde7ed80bd88bf945cca6b71fca9eccc4a910666dad4df56a24471535e1d6007e1ea24567002c927357b525683b02c6a7ad2986aca738fc81ab736219f SHA512 6209a0a5a46a3efcede3cb1e263467173153d779b6267ba4c20f46421a9abd8743a7068527ace350a3da3ef3046b0399e09b37aba917fabe020c8c2600b60fdf
-AUX 006-linux411.patch 800 BLAKE2B 28ef5e50fa11fc15b409f3b3ee42aaf329756354ba8b7923d1b27939a6b21bd64b72a4adfb2eeff3c48bb8c4c1bc4294e8fd7744b83768974bf5d0592e20c148 SHA512 b7db17e30731a9cbc940b83f7b62f059529cff6c134e47e2176cd7c6fcd8d028334ed4fe1fdce7cf1aef87590f9664b463383ae3302a6e2aabe1baa79fbc5c95
-AUX 007-linux412.patch 2776 BLAKE2B 06035b1bca121c72b5e6bf120df644d5496d6020cf8537ec83917bb0f5b5a0a25129730f46201da2cc61e48cbcf4e9d3ed7757f3223e1d3b6e29b531c4c8fabb SHA512 d4acd891023ff8d4b9308afdd55c4e971cdf7773570c8e3a545400ed9e414eeca5016ebc8a530002e7858fd44f1fd5b0ae70c0d0a3cdbbffd5bd9abb702b2cde
-AUX 008-linux415.patch 1063 BLAKE2B 091e1da266ebaa0d429663facf3e81c849fe900c446e1c270ba23b65c15a99efeb1ae6c20905dfcc21b5f4bc3f91b32eb3b7bc9841f2a23508c71312403af774 SHA512 2fb5c3eebd48b6099fb87a9fd92545c17b2abf318b040a434c1b0bdd75a7a682b6e7ec9f80245c198f1c306bbaef35a2488123c5ba8764d5a83eb18132c0857b
-AUX 009-fix_mac_profile_discrepancy.patch 492 BLAKE2B 7c8012fa51592a3fca6dfde7a7a9c6dd37eb6c406d3f8695927e32c9e714c3faa23295b116a6cd97ec0403b123747b9095883bd7e3abe6c1888c3c9a4630f9f4 SHA512 97d34398d18ac9a7943233c12e01cf7006bf0648938303100932cabf5000c346f1a852978e3c8c48bb6e8652177e625ce1190047d580624319e680a13802ce92
-AUX 010-linux56.patch 1866 BLAKE2B 21f7fc163ffcf6857f3a21a8519a42600fd6b3658d14b32191ef1142c817c10c8dc691a3bc39228927ac29d7b7ac5c3a62eb786853046bacb9cc74efb51b6cb0 SHA512 8fb320c1272246c91fdd99cade2fb67a6ecd924a132c1b9432fa1ff0338444700451ffc6a1cb35e07188c58c5bd1ccaf59ebf014c49f44cb6ba33d1ec732859d
-AUX 011-linux59.patch 5933 BLAKE2B c1f522f6554a7bfe0f7b789b042ada14316ecc87bc196c83bec95f684152f323a4c31f60ff26843e36338b8c7949bf36719a5c8afa439ff71f7c74dae4c755b6 SHA512 b9a0193ab604da92c99051e2a4fd91e43c3b6aeea7dbda15635b43eabd35b414e197bf5f25ac0d4ec905a1cb75abc15f165428470bc788dbefd73f178d165099
-AUX 012-linux517.patch 2790 BLAKE2B d84d08161530bb9f05f627ec798a0897643869ea9b80781ae9eee85b072922c52e5127e55f04265c53fcfedc4e9da166eb3bb9f9fc2e139d62517ec54c2f45bb SHA512 ec34a2800d7a70a7a1ff8a96ba87c2327f68066addf5adc9f60ba303cfda9cee39159f110013f075e357988f92efe802010e9c1d7884a5dfb1908df1489bd608
-AUX 013-linux518.patch 2337 BLAKE2B e5ae3570dc2f27105c50e6dec807c1f4f1a2824995e0951e7ff405114d519e4f33992d8d2ea2c2d4fc3f9271d57f89bfb5b6b5c79af2c89492209a86ad673456 SHA512 b815a4ff9289d81ddbe7f76553b092df19ee137438c9e33811c3a8b15e8a3896763715975b42391b4edfb60cfb0db46b71f4fee0f33a7b07f8d45cc4608d3faa
-AUX 014-linux414.patch 936 BLAKE2B 0b1075bd59e8046969052ceb9cbe305ac2373b5d1600701ffcffb5219d3765ef5d15465c3aff63bbc547ed4f663dc4816d1b4fa09176d6c78828e488a9a863c4 SHA512 30207d8872ee8925a7c7412184e3b4fd6935f8017fb46e1173aca77333c99fb4316ef1511a83e345593c369210d4cbf976eea53995e229b4d856d97662c98961
-AUX 015-linux600.patch 1267 BLAKE2B 7d4dfe48577456436d0932bd1eca78fc1f0a952e141f13641b93bb24161a9f6847152966631cc05a6d707f9cf8adbded55a19aeaa2c15c963fffb5db9eff9f63 SHA512 21cf9b0b01ad4b30fa8541638e9a8428c8c68c89992b7e15c19f8526e8df6f8c5ff20de5ae2759b36fead07deacd1805749a9ed82611d15fb75dc94812e4941e
-AUX 016-linux601.patch 4316 BLAKE2B 6c627b392a5b05248e3fb78c9be0329deee601b70d88334f5f61e1af14643a7367fabbf3d3fce23b0cae317456ecdc7e7985ce019c3bc283117f3ba2be5b25b5 SHA512 8879aeb0a79b7e82ca5e70fd33acefda1733594d7e78940932d2c220cad48b643fc2c0cb8e79f1fc3ebaaa5a4383a0caf6798214f911c2f5859c8fab1c8532e8
+AUX 006-linux411.patch 702 BLAKE2B 8fc2ad06beac301609738b44ae4b8bb722fc55ed3373462dc1e37867a9e0302368324ea5d4f6b14513fa8b7e237bb9d4e86af33b71d51a91f3df997a75900880 SHA512 1f1358ad4f6ccbd727900057fd06a1eeb1eb8be638f50afd09263cbcb8019c01c737df00455c30d02a699d47c43388c923a1704bf72848c6e0ab68ed5cb31e83
+AUX 007-linux412.patch 2544 BLAKE2B e73e78eb26f5f862ca3f0e9853d213acc0dd89cc6af2189f6916c281f671b3c4f504257e5be367d51860243ffd8d6285e0db7c5542c08c44f21a12f31973e2d4 SHA512 c65a5fd1eaefbe4f6719c8e7e055c473327186eda1bc1305ecb40a1a757e0b6bf7a86b855af25f124696b0bc1bbe5a44d16d30cb665ced0cddc3f67698908f16
+AUX 008-linux415.patch 991 BLAKE2B b7429aad683d20197ba467ee25258fe0948d63fb9e120db6d8f0b511eeac70ebae89c61c2f4c65ffb2a88494b5b5f9d357c150a6c95b3562380da223531a00f1 SHA512 758e8caa7356a00834e4c9bb554195c6e4f08851bbc64816790a83c83e5cae462d6e5d5d309a3e65040c0424de626fb18c81855f5281f9ae3d4d42d6059193df
+AUX 009-fix_mac_profile_discrepancy.patch 420 BLAKE2B 5caf4cf96a21b883f865fa30a6ddbb84324865d020b498eca6885ea40d1669e273670da34bebb9824120be444ee34e19a8334aa8f633b6aea2de6fd7e060ad3e SHA512 76159e4b5ea8a7e12638da96c96b8a12feec1b0acefd126d2f8dacd37cd3a688c4621b2a06cac2d7a78254cb37b838333263a712d7671ceb3ae3d0392b2ecef1
+AUX 010-linux56.patch 1686 BLAKE2B 9365929984459764d01b77c86d81e9189f56f2cd2d7778f48fac78d7f9bb2c6c3bc23ca6b057fb3dbc8daefd9991827096923c3924fa90bc5300e94161623c60 SHA512 2949045cd3d34f180fd4513a95cd66ce8c1e057b722982237790d0c7c201ec6b236dc6c4e95f4d4972e5643a05fe82c62681f455fc2d1cb094986ba8434926e3
+AUX 011-linux59.patch 5146 BLAKE2B 0f9b96d618bea41cbe7111062542dbd32a074bb8c570cab1289fab62085d1f28c6c93b4939be6d6120b9c121ecaa975aff56b8d3a5d6e16c8c251121e72c0659 SHA512 a4d5545af37b655489d31802b56c9f22767cc1798fcd53b224bda0bf750e2317c8355baf27f1161cdc290db21a3f60beb82745393f6baa0a5baf888c2f49d2c5
+AUX 012-linux517.patch 2601 BLAKE2B dcea7ea4b6749cd0a6306be6906c61052eaa645086c6fe75862b714f3c3195972c70bffec871435072c3912a6997d3144977c421965b267ac05b8814dc344fa6 SHA512 e95f8558d4a6cf13994c1172c704e44bf1bc2dccebf5427c210b98999f5ab027f5907957e714bc4da2914323580bbb7595b14a742712faee2836f2c1ad573ede
+AUX 013-linux518.patch 2204 BLAKE2B 78d610e50b11a320a17dd2f38ab3e190623ca1c6c12cddc6c35718ae911454f0b4c61baec6541448519caf5f6f5515d429a5999fc0cc1e55e88df7036468cb04 SHA512 8e345dc798033bf1d993024587c71951c483176c8830605c823ed5b1db1e3c0d9461fc3615095511645de20053122284fd735f97eb648cc488a62b5685acbc59
+AUX 014-linux414.patch 748 BLAKE2B 463464cd9fa94562773521207b5a8100b66359d1a00526df57978a9c09b66d09dbe7027c2ca5c775ef78f7463699c6e59a2a5a3ae7971b8d0a1df4d71bb57a58 SHA512 3f585962e6cac1650c9eff2bfe4e1c51efa23a18aa0f19d007244c1254d18b320f6f3fe42b6b3b2ee5ab9f166c352faa65980e61f22a2e26bc92bdd25d763585
+AUX 015-linux600.patch 1078 BLAKE2B 1c8e5d72f3333285ccdbfa3bc84be280274c94521f2958a26b77f642e0093a55ed581d6cffd4647b476bbbfa5a74e272abece0a68be3fccaafde58d21f264833 SHA512 db47fa36cd7d8ba6ce034efc6cf60fd4c6d38d6335099a8b8a02cb354e5c0244c65a62529baf16468527e1047827612807a404ae7a03ac15cfe3a0bd9d5bfe91
+AUX 016-linux601.patch 4159 BLAKE2B 20ae46a34a42b2c93ecc73f4c4d3efdadf3150cd5b039c92b8ced62804dfb5f6dcd59b4599c06770b2b6fc801049085ebaac3f2c0d0c8be5c014deea7d662e7c SHA512 5de9714c279d0ee7d7cfbee59c7842f587c3b37ba292e15eb6a8b331f1fa609fa9aea01968a1995a90f9d924a0862a3601611ca8af0819840628944835c0204e
+AUX 017-handle-new-header-name-6.12.patch 909 BLAKE2B a1910049f7d9d976b05284fdee0f92d5c8ddd131f637652bc57c692b4eb5e35bef98f9f14cc27b3cd7b2bb9e179ca56c5fb86974d83f43efc81ec55cef1c0351 SHA512 5c649993d108593e3bfa278dae10bee8b4b0c2377469c716d8c315e74b623619b6e0b81fdaff3b33fa0a6ef7fdf0e1462b894152f49b888816ff42634f1f4779
+AUX 018-broadcom-wl-fix-linux-6.13.patch 978 BLAKE2B 72197f3ef943324d35ddeba243c5779b278ed9d844d6351a8b2a292bfe02dd1f790dd62646c03315747e0545185a4dc1a59c8b72f0a818398aa92a1a0d939e86 SHA512 1a676c4f646845bf104506c8ac88c31c4de138b81999ff0347cad3c48bb2fcb1a37ea2339f433bd55ba2bdf1dbdaf7f63c0ef7a8b7a4484784234374634b1592
+AUX 019-broadcom-wl-fix-linux-6.14.patch 1810 BLAKE2B 03533c2de71c0f4b8d827af6f799b50359ec673c8adcaa53d8b4c159c63000d4016209c7b08ef41f1c09bd0cbf55e7727e07be43e4e49fab4141dbaf227b9d8e SHA512 de37991b61884379fb3edbf55e798fa4751f7b6b2e9eabdcbe2a099401ec17ad079aeaa269ae0ec4b5fd30d1d160bb4856334a7516a2e293d03caa81ac82708a
 AUX broadcom-sta-modules.conf 335 BLAKE2B 25faab24a10f9a20b2178ac18e832e09a8a664e36d3eb794d4bf09db0ae7e0220105908d128523edb1bd218b8f090b9056700de93cf8a7eac7ac70f3f6dc575f SHA512 c882b853948e695b35f9c8d366d992ae73efa7aefd1c167ad36cd8e83edc5988e4b0caf36046d88481051a00e3c88bd42d4e83d88e36910f3c62d725e063af27
 DIST README-broadcom-sta-6.30.223.271.txt 17216 BLAKE2B af6db6e129911d1589d7d6cb7166bee32ce1ca98a4e5c9b3515a44e48681d8a7a7a6b697419b2bcd9c46f0f4ca1f7ece632b63531b4a4ecd91df4f9dddf043c9 SHA512 672ecc5afcd8535a9f8beb4baea5a40c584b7682844e9ff0e4f66b7406b42118a99dce1fcd580118187fdc506781334b8243082def2b78dce916d90c55ab3663
 DIST hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz 2869247 BLAKE2B 2e3189c468cec50b1a980452a4b2bd0f9657d9adf6fae2a95a8b1c2d1df2f5f6beb4cb903f72f444eddf823fe4375299864cd62191c9d59c4f77598b5d3aa246 SHA512 0361ba30d97bcb1dedf46c11ef1b9a16f09cde3faa6be87b3ccc28679f34183c2fdf511e7c3b5c26b304f6961da454ccf71844b92bbb2f25aa876249496a2f1b
 DIST hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz 2928541 BLAKE2B e9d01c1a1a63c07f720e3ee53ee3ef634ab12694135300cb0ce47ade0e9e0084967a0b6df64d983e8184240eb3defb128f650bddb7727e901d50315307f3398a SHA512 6855781f7c69a9aecb9461932423688964879d5a4df571f01ae7adaa7bf21a410bef839605d555afb6c8f4eec92fe8510af6cb120930095617ff6cdcccedaf17
-EBUILD broadcom-sta-6.30.223.271-r7.ebuild 3769 BLAKE2B 9334cc504b4e48211b7029842511b94685297edf10faa159a65ef68d86986a3c3e73d3b74b6dabfc347356c6e2e53208bdb042f706c13d6332383f5051b5c062 SHA512 8fc1532c434d42f4a8f07dd47cac429201e69346c3fc514f8851357761095983eea4c57316901e114734c017140f10426c4bc20a050f77271e9ca442f99ed8cc
+EBUILD broadcom-sta-6.30.223.271-r8.ebuild 4063 BLAKE2B 509aa1bf12f5a42ec2e3144f26c545ff439f3c9001f9207d55c62e5fc66709d7635679faf2939de2f49f89ceaf36079ac539dbb54f4909c57c0a6a28670157b4 SHA512 4a8e21d9b66690479a6fd0bc65c4811be412c635d6ed90481c2f0a18b84c17ab576458c8780366ba09d6330f45c1e314fee22694091d9e9ffc8e9956e1486f5f
 MISC metadata.xml 250 BLAKE2B 3418f6ba3586bffc26461ed5b80518671c845466e4f0ceb2468b5f9a12efa0ee7bee2dedd74908c11bcdd7bc92fbf3c018f18e011c2cb9c319945e185147233f SHA512 b0ea50f3526de06f698a5914ba34edeb1df5f04ab23f457e63685875f938b4dc70b8602266a90f7d07e9e2ebe547b37ff5b577eebb08256d5606046438582032
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r7.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r8.ebuild
index efe1beb913de..e8bf4205ee86 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r7.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r8.ebuild
@@ -1,26 +1,28 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 inherit linux-mod-r1
 
 DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver"
 HOMEPAGE="https://www.broadcom.com/support/802.11"
 SRC_BASE="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35"
-SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz )
+SRC_URI="
+	x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz )
 	amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )
-	https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_${PV}.txt -> README-${P}.txt"
+	https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_${PV}.txt -> README-${P}.txt
+"
 
+S="${WORKDIR}"
 LICENSE="Broadcom"
 SLOT="0"
+
 KEYWORDS="-* ~amd64 ~x86"
 
 RESTRICT="mirror"
 
 DEPEND="virtual/linux-sources"
-RDEPEND=""
-
-S="${WORKDIR}"
 
 PATCHES=(
 	"${FILESDIR}/001-null-pointer-fix.patch"
@@ -39,6 +41,9 @@ PATCHES=(
 	"${FILESDIR}/014-linux414.patch"
 	"${FILESDIR}/015-linux600.patch"
 	"${FILESDIR}/016-linux601.patch"
+	"${FILESDIR}/017-handle-new-header-name-6.12.patch"
+	"${FILESDIR}/018-broadcom-wl-fix-linux-6.13.patch"
+	"${FILESDIR}/019-broadcom-wl-fix-linux-6.14.patch"
 )
 
 pkg_pretend() {
@@ -62,6 +67,7 @@ pkg_setup() {
 	# b43 via udev rules. Moreover, previous fix broke binpkgs support.
 	CONFIG_CHECK="~!B43 ~!BCMA ~!SSB ~!X86_INTEL_LPSS"
 	CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP"
+	CONFIG_CHECK3="~!MAC80211"
 	ERROR_B43="B43: If you insist on building this, you must blacklist it!"
 	ERROR_BCMA="BCMA: If you insist on building this, you must blacklist it!"
 	ERROR_SSB="SSB: If you insist on building this, you must blacklist it!"
@@ -70,7 +76,9 @@ pkg_setup() {
 	ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else."
 	ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA."
 	ERROR_X86_INTEL_LPSS="X86_INTEL_LPSS: Please disable it. The module does not work with it enabled."
-	if kernel_is ge 3 8 8; then
+	if kernel_is ge 6 1 127; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK3} CFG80211 ~!PREEMPT_RCU ~!PREEMPT"
+	elif kernel_is ge 3 8 8; then
 		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT"
 	elif kernel_is ge 2 6 32; then
 		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211"
diff --git a/net-wireless/broadcom-sta/files/001-null-pointer-fix.patch b/net-wireless/broadcom-sta/files/001-null-pointer-fix.patch
index 0ebe1e242243..6b1bb33180ff 100644
--- a/net-wireless/broadcom-sta/files/001-null-pointer-fix.patch
+++ b/net-wireless/broadcom-sta/files/001-null-pointer-fix.patch
@@ -4,12 +4,6 @@ Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=773713
 Bug-Ubuntu: https://launchpad.net/bugs/1415880
 Last-Update: 2015-08-18
 
----
- src/wl/sys/wl_linux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
-index 860b935..295156f 100644
 --- a/src/wl/sys/wl_linux.c
 +++ b/src/wl/sys/wl_linux.c
 @@ -2157,8 +2157,8 @@ wl_start(struct sk_buff *skb, struct net_device *dev)
@@ -25,8 +19,8 @@ index 860b935..295156f 100644
 -- 
 1.9.1
 
---- a/src/wl/sys/wl_linux.a	2023-04-16 23:06:52.255588442 -0500
-+++ b/src/wl/sys/wl_linux.c	2023-04-16 23:07:22.315309655 -0500
+--- a/src/wl/sys/wl_linux.a
++++ b/src/wl/sys/wl_linux.c
 @@ -737,9 +737,6 @@
  		dev->name, device,
  		WL_ALL_PASSIVE_ENAB(wl) ?  ", Passive Mode" : "", EPI_VERSION_STR);
diff --git a/net-wireless/broadcom-sta/files/002-rdtscl.patch b/net-wireless/broadcom-sta/files/002-rdtscl.patch
index 1b9862cc3d8d..8612895d7082 100644
--- a/net-wireless/broadcom-sta/files/002-rdtscl.patch
+++ b/net-wireless/broadcom-sta/files/002-rdtscl.patch
@@ -5,9 +5,8 @@ new function. References:
 https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=fe47ae6e1a5005b2e82f7eab57b5c3820453293a
 https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=4ea1636b04dbd66536fa387bae2eea463efc705b
 
-diff -ru a/src/shared/linux_osl.c b/src/shared/linux_osl.c
---- a/src/shared/linux_osl.c	2015-09-19 01:47:15.000000000 +0300
-+++ b/src/shared/linux_osl.c	2015-11-21 15:20:30.585902518 +0200
+--- a/src/shared/linux_osl.c
++++ b/src/shared/linux_osl.c
 @@ -932,7 +932,11 @@
  	uint cycles;
  
diff --git a/net-wireless/broadcom-sta/files/003-linux47.patch b/net-wireless/broadcom-sta/files/003-linux47.patch
index 566680a09140..3ad02380ebdb 100644
--- a/net-wireless/broadcom-sta/files/003-linux47.patch
+++ b/net-wireless/broadcom-sta/files/003-linux47.patch
@@ -9,8 +9,8 @@ This patch refactors the references of IEEE80211_BAND_* to NL80211_BAND_*
 Reference:
 https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=57fbcce37be7c1d2622b56587c10ade00e96afa3
 
---- a/src/wl/sys/wl_cfg80211_hybrid.c	2016-06-13 11:57:36.159340297 -0500
-+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2016-06-13 11:58:18.442323435 -0500
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
 @@ -236,7 +236,7 @@
  #endif				
  
diff --git a/net-wireless/broadcom-sta/files/004-linux48.patch b/net-wireless/broadcom-sta/files/004-linux48.patch
index 20e8a9ae49d2..10315f7f2326 100644
--- a/net-wireless/broadcom-sta/files/004-linux48.patch
+++ b/net-wireless/broadcom-sta/files/004-linux48.patch
@@ -4,12 +4,6 @@ Date: Fri, 2 Sep 2016 17:35:34 +0200
 Subject: [PATCH 1/1] Add support for Linux 4.8
 
 Orginal author: Krzysztof Kolasa
----
- src/wl/sys/wl_cfg80211_hybrid.c | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
-index 2fc71fe..ec5e472 100644
 --- a/src/wl/sys/wl_cfg80211_hybrid.c
 +++ b/src/wl/sys/wl_cfg80211_hybrid.c
 @@ -2388,8 +2388,16 @@ wl_bss_connect_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
diff --git a/net-wireless/broadcom-sta/files/006-linux411.patch b/net-wireless/broadcom-sta/files/006-linux411.patch
index 7a2e8c0c6cb0..87715a9c8e2a 100644
--- a/net-wireless/broadcom-sta/files/006-linux411.patch
+++ b/net-wireless/broadcom-sta/files/006-linux411.patch
@@ -1,4 +1,3 @@
-diff -u sys0/wl_cfg80211_hybrid.c sys/wl_cfg80211_hybrid.c
 --- a/src/wl/sys/wl_cfg80211_hybrid.c
 +++ b/src/wl/sys/wl_cfg80211_hybrid.c
 @@ -39,6 +39,10 @@
@@ -12,7 +11,6 @@ diff -u sys0/wl_cfg80211_hybrid.c sys/wl_cfg80211_hybrid.c
  #define EVENT_TYPE(e) dtoh32((e)->event_type)
  #define EVENT_FLAGS(e) dtoh16((e)->flags)
  #define EVENT_STATUS(e) dtoh32((e)->status)
-diff -u sys0/wl_linux.c sys/wl_linux.c
 --- a/src/wl/sys/wl_linux.c
 +++ b/src/wl/sys/wl_linux.c
 @@ -2915,7 +2915,9 @@
diff --git a/net-wireless/broadcom-sta/files/007-linux412.patch b/net-wireless/broadcom-sta/files/007-linux412.patch
index 1673f063cdb5..8fb62bdfde5f 100644
--- a/net-wireless/broadcom-sta/files/007-linux412.patch
+++ b/net-wireless/broadcom-sta/files/007-linux412.patch
@@ -5,12 +5,6 @@ Subject: [PATCH] Apply patch from Debian bug #867258
 
 Compile fix with kernel 4.12
 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=867258
----
- src/wl/sys/wl_cfg80211_hybrid.c | 29 +++++++++++++++++++++++++----
- 1 file changed, 25 insertions(+), 4 deletions(-)
-
-diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
-index c46944a..1a9840a 100644
 --- a/src/wl/sys/wl_cfg80211_hybrid.c
 +++ b/src/wl/sys/wl_cfg80211_hybrid.c
 @@ -53,7 +53,11 @@ u32 wl_dbg_level = WL_DBG_ERR;
diff --git a/net-wireless/broadcom-sta/files/008-linux415.patch b/net-wireless/broadcom-sta/files/008-linux415.patch
index 1bced2f68ab1..fbaa08bc7057 100644
--- a/net-wireless/broadcom-sta/files/008-linux415.patch
+++ b/net-wireless/broadcom-sta/files/008-linux415.patch
@@ -1,5 +1,5 @@
---- a/src/wl/sys/wl_linux.c	2017-07-17 00:11:24.000000000 +0100
-+++ b/src/wl/sys/wl_linux.c	2018-01-27 09:49:47.057799596 +0000
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
 @@ -93,7 +93,11 @@
  
  #include <wlc_wowl.h>
diff --git a/net-wireless/broadcom-sta/files/009-fix_mac_profile_discrepancy.patch b/net-wireless/broadcom-sta/files/009-fix_mac_profile_discrepancy.patch
index 4260eba5057a..bcc6d50dc8ac 100644
--- a/net-wireless/broadcom-sta/files/009-fix_mac_profile_discrepancy.patch
+++ b/net-wireless/broadcom-sta/files/009-fix_mac_profile_discrepancy.patch
@@ -1,5 +1,5 @@
---- a/src/wl/sys/wl_cfg80211_hybrid.c	2015-09-19 00:47:30.000000000 +0200
-+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2018-11-14 14:06:03.313487995 +0100
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
 @@ -1444,11 +1444,10 @@
  	s32 rate;
  	s32 err = 0;
diff --git a/net-wireless/broadcom-sta/files/010-linux56.patch b/net-wireless/broadcom-sta/files/010-linux56.patch
index f8d5783819cd..4cee72e9081d 100644
--- a/net-wireless/broadcom-sta/files/010-linux56.patch
+++ b/net-wireless/broadcom-sta/files/010-linux56.patch
@@ -1,5 +1,3 @@
-diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c
-index 6157d18..8237ec7 100644
 --- a/src/shared/linux_osl.c
 +++ b/src/shared/linux_osl.c
 @@ -942,7 +942,7 @@ osl_getcycles(void)
@@ -11,8 +9,6 @@ index 6157d18..8237ec7 100644
  }
  
  void
-diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
-index 0d05100..2ed1f0d 100644
 --- a/src/wl/sys/wl_linux.c
 +++ b/src/wl/sys/wl_linux.c
 @@ -582,7 +582,7 @@ wl_attach(uint16 vendor, uint16 device, ulong regs,
diff --git a/net-wireless/broadcom-sta/files/011-linux59.patch b/net-wireless/broadcom-sta/files/011-linux59.patch
index 6ef476464c0c..9494ed6f1f50 100644
--- a/net-wireless/broadcom-sta/files/011-linux59.patch
+++ b/net-wireless/broadcom-sta/files/011-linux59.patch
@@ -15,16 +15,6 @@ See also: https://lwn.net/Articles/722267/
           https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5e6e9852d6f76e01b2e6803c74258afa5b432bc5
 
 Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
----
- src/wl/sys/wl_cfg80211_hybrid.c | 25 ++-------------------
- src/wl/sys/wl_iw.c              | 25 ++-------------------
- src/wl/sys/wl_linux.c           | 40 ++++++++++++++++++++++++++++-----
- src/wl/sys/wl_linux.h           |  2 ++
- src/wl/sys/wlc_pub.h            |  1 +
- 5 files changed, 42 insertions(+), 51 deletions(-)
-
-diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
-index 7b606e0..1e0adb7 100644
 --- a/src/wl/sys/wl_cfg80211_hybrid.c
 +++ b/src/wl/sys/wl_cfg80211_hybrid.c
 @@ -38,6 +38,7 @@
@@ -67,8 +57,6 @@ index 7b606e0..1e0adb7 100644
  }
  
  static s32
-diff --git a/src/wl/sys/wl_iw.c b/src/wl/sys/wl_iw.c
-index c4c610b..e346b15 100644
 --- a/src/wl/sys/wl_iw.c
 +++ b/src/wl/sys/wl_iw.c
 @@ -37,6 +37,7 @@ typedef const struct si_pub	si_t;
@@ -110,8 +98,6 @@ index c4c610b..e346b15 100644
  }
  
  static int
-diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
-index 947cef3..f04c148 100644
 --- a/src/wl/sys/wl_linux.c
 +++ b/src/wl/sys/wl_linux.c
 @@ -1643,10 +1643,7 @@ wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
@@ -175,8 +161,6 @@ index 947cef3..f04c148 100644
  static struct net_device_stats*
  wl_get_stats(struct net_device *dev)
  {
-diff --git a/src/wl/sys/wl_linux.h b/src/wl/sys/wl_linux.h
-index 5b1048e..c8c1f41 100644
 --- a/src/wl/sys/wl_linux.h
 +++ b/src/wl/sys/wl_linux.h
 @@ -22,6 +22,7 @@
@@ -195,8 +179,6 @@ index 5b1048e..c8c1f41 100644
  extern struct net_device * wl_netdev_get(wl_info_t *wl);
  
  #endif 
-diff --git a/src/wl/sys/wlc_pub.h b/src/wl/sys/wlc_pub.h
-index 53a98b8..2b5a029 100644
 --- a/src/wl/sys/wlc_pub.h
 +++ b/src/wl/sys/wlc_pub.h
 @@ -24,6 +24,7 @@
diff --git a/net-wireless/broadcom-sta/files/012-linux517.patch b/net-wireless/broadcom-sta/files/012-linux517.patch
index 6f23316691c8..9bc7a11d79cc 100644
--- a/net-wireless/broadcom-sta/files/012-linux517.patch
+++ b/net-wireless/broadcom-sta/files/012-linux517.patch
@@ -16,12 +16,6 @@ Applies on top of all the patches applied to broadcom-wl-dkms 6.30.223.271-28 on
 
 See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=adeef3e32146a8d2a73c399dc6f5d76a449131b1
           https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=359745d78351c6f5442435f81549f0207ece28aa
----
- src/wl/sys/wl_linux.c | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
-index e491df7..e4614fb 100644
 --- a/src/wl/sys/wl_linux.c
 +++ b/src/wl/sys/wl_linux.c
 @@ -93,6 +93,10 @@ struct iw_statistics *wl_get_wireless_stats(struct net_device *dev);
diff --git a/net-wireless/broadcom-sta/files/013-linux518.patch b/net-wireless/broadcom-sta/files/013-linux518.patch
index d837429a6899..dbac7f85c9ad 100644
--- a/net-wireless/broadcom-sta/files/013-linux518.patch
+++ b/net-wireless/broadcom-sta/files/013-linux518.patch
@@ -1,6 +1,5 @@
-diff -u -r a/src/shared/linux_osl.c b/src/shared/linux_osl.c
---- a/src/shared/linux_osl.c	2022-05-24 20:51:15.662604980 +0000
-+++ b/src/shared/linux_osl.c	2022-05-24 21:13:38.264472425 +0000
+--- a/src/shared/linux_osl.c
++++ b/src/shared/linux_osl.c
 @@ -599,6 +599,8 @@
  	va = kmalloc(size, GFP_ATOMIC | __GFP_ZERO);
  	if (va)
diff --git a/net-wireless/broadcom-sta/files/014-linux414.patch b/net-wireless/broadcom-sta/files/014-linux414.patch
index 0576aa5cf97c..256a4d90216b 100644
--- a/net-wireless/broadcom-sta/files/014-linux414.patch
+++ b/net-wireless/broadcom-sta/files/014-linux414.patch
@@ -4,12 +4,6 @@ Subject: linux414
 Origin: https://bugs.debian.org/885885
 
 linux 4.14 changed the kernel_read function prototype.
----
- src/shared/linux_osl.c | 12 +++++++++++-
- 1 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c
-index 9adc392..b24a973 100644
 --- a/src/shared/linux_osl.c
 +++ b/src/shared/linux_osl.c
 @@ -1076,11 +1076,21 @@ osl_os_get_image_block(char *buf, int len, void *image)
diff --git a/net-wireless/broadcom-sta/files/015-linux600.patch b/net-wireless/broadcom-sta/files/015-linux600.patch
index 8645907bbae4..2b02046cb328 100644
--- a/net-wireless/broadcom-sta/files/015-linux600.patch
+++ b/net-wireless/broadcom-sta/files/015-linux600.patch
@@ -9,12 +9,6 @@ See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/com
 
 Original patch by Joan Bruguera:
 https://gist.github.com/joanbm/207210d74637870c01ef5a3c262a597d
----
- src/wl/sys/wl_cfg80211_hybrid.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
-index 5e9e6d3..5ec35c5 100644
 --- a/src/wl/sys/wl_cfg80211_hybrid.c
 +++ b/src/wl/sys/wl_cfg80211_hybrid.c
 @@ -2412,7 +2412,11 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
diff --git a/net-wireless/broadcom-sta/files/016-linux601.patch b/net-wireless/broadcom-sta/files/016-linux601.patch
index 721967d275c2..e099b789bd6c 100644
--- a/net-wireless/broadcom-sta/files/016-linux601.patch
+++ b/net-wireless/broadcom-sta/files/016-linux601.patch
@@ -1,6 +1,5 @@
-diff -Nurp -u -r a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
---- a/src/wl/sys/wl_cfg80211_hybrid.c	2022-12-12 00:23:30.821615599 +0000
-+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2022-12-12 00:35:47.854975024 +0000
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
 @@ -105,14 +105,28 @@ static s32 wl_cfg80211_get_tx_power(stru
  static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm);
  #endif
diff --git a/net-wireless/broadcom-sta/files/017-handle-new-header-name-6.12.patch b/net-wireless/broadcom-sta/files/017-handle-new-header-name-6.12.patch
new file mode 100644
index 000000000000..f9906f16aeb0
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/017-handle-new-header-name-6.12.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/947928
+
+Adds support for the new name of the asm/unaligned.h header file for kernels >=6.12.0 (header file was renamed to "linux/unaligned.h")
+Bug found by Sam Petch 
+Patch by Sam Petch
+
+TESTING DETAILS:
+
+Bugfix tested by Sam Petch on kernels: gentoo-sources:6.6.67, gentoo-sources:6.12.4-r1, gentoo-sources:6.12.9
+
+Patch tested on kernels: gentoo-sources:6.6.67, gentoo-sources:6.12.9
+
+Bugfix and patch tested on device: 2012 Macbook Pro (A1278) running Gentoo Linux with Gnome Desktop / OpenRC profile
+
+Chipset: BCM4331 (Broadcom)
+
+Contact: sam.petch.recall824@passinbox.com
+
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -56,7 +56,12 @@
+ #include <asm/irq.h>
+ #include <asm/pgtable.h>
+ #include <asm/uaccess.h>
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
++#include <linux/unaligned.h>
++#else
+ #include <asm/unaligned.h>
++#endif
+ 
+ #include <proto/802.1d.h>
+ 
diff --git a/net-wireless/broadcom-sta/files/018-broadcom-wl-fix-linux-6.13.patch b/net-wireless/broadcom-sta/files/018-broadcom-wl-fix-linux-6.13.patch
new file mode 100644
index 000000000000..940eb7978c53
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/018-broadcom-wl-fix-linux-6.13.patch
@@ -0,0 +1,27 @@
+From  https://gist.github.com/joanbm/72189c81ff67b39d36a660cf00483ccb
+From: =?UTF-8?q?Joan=20Bruguera=20Mic=C3=B3?= <joanbrugueram@gmail.com>
+Date: Sat, 12 Oct 2024 11:54:40 +0000
+Subject: [PATCH] Tentative patch for broadcom-wl 6.30.223.271 driver for Linux
+ 6.13-rc1
+
+The net/lib80211.h header has been removed by commit
+"wifi: ipw2x00/lib80211: move remaining lib80211 into libipw"
+(Johannes Berg, 7 Oct 2024).
+The header does not appear to be actually used anywhere, so remove it.
+
+ #include <asm/irq.h>
+ #include <asm/pgtable.h>
+--- a/src/include/linuxver.h
++++ b/src/include/linuxver.h
+@@ -147,7 +147,7 @@ typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs *ptregs);
+ #include <linux/sched.h>
+ #endif
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) && LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0)
+ #include <net/lib80211.h>
+ #endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+-- 
+2.47.0
+
diff --git a/net-wireless/broadcom-sta/files/019-broadcom-wl-fix-linux-6.14.patch b/net-wireless/broadcom-sta/files/019-broadcom-wl-fix-linux-6.14.patch
new file mode 100644
index 000000000000..a431b8f060d8
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/019-broadcom-wl-fix-linux-6.14.patch
@@ -0,0 +1,40 @@
+From https://gist.github.com/joanbm/b711bafdcb065d57364a701061b902a3
+From: =?UTF-8?q?Joan=20Bruguera=20Mic=C3=B3?= <joanbrugueram@gmail.com>
+Date: Sun, 8 Dec 2024 17:57:43 +0000
+Subject: [PATCH] Tentative fix for broadcom-wl 6.30.223.271 driver for Linux
+ 6.14-rc1
+
+Related to the new parameter for get_tx_power introduced in
+"wifi: cfg80211: send MLO links tx power info in GET_INTERFACE"
+(Rameshkumar Sundaram, 25 Nov 2024).
+
+As the driver doesn't support Multi-Link, we just ignore it afterwards.
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -99,7 +99,10 @@ static s32 wl_cfg80211_set_tx_power(struct wiphy *wiphy,
+            enum tx_power_setting type, s32 dbm);
+ #endif
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)
++static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
++                                    unsigned int link_id, s32 *dbm);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, s32 *dbm);
+ #else
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm);
+@@ -1152,7 +1155,10 @@ wl_cfg80211_set_tx_power(struct wiphy *wiphy, enum tx_power_setting type, s32 db
+ 	return err;
+ }
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)
++static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
++                                    unsigned int link_id, s32 *dbm)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, s32 *dbm)
+ #else
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm)
+-- 
+2.48.1
+