Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging / Packages / broadcom-wl-dkms
Commits: fe6f778b by Jan Alexander Steffens (heftig) at 2025-03-18T05:12:21+01:00 6.30.223.271-42: add patch for linux 6.14 >From >https://salsa.debian.org/broadcom-sta-team/broadcom-sta/-/blob/c50333d984929b0917e93768cc5679834fce63a2/debian/patches/32-Prepare-for-6.14.0-rc6.patch Thanks, blade. - - - - - 3 changed files: - .SRCINFO - + 019-linux614.patch - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = broadcom-wl-dkms pkgdesc = Broadcom 802.11 Linux STA wireless driver pkgver = 6.30.223.271 - pkgrel = 41 + pkgrel = 42 url = https://www.broadcom.com/site-search?filters[pages][content_type][values][]=Downloads&q=802.11%20linux%20sta%20wireless%20driver install = broadcom-wl-dkms.install arch = x86_64 @@ -28,6 +28,7 @@ pkgbase = broadcom-wl-dkms source = 016-linux601.patch source = 017-linux612.patch source = 018-linux613.patch + source = 019-linux614.patch source = https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz b2sums = 7c4eaa825a37358509a08e5105665eeabc9f097945b6fa163cd5722b00638da5889f5466bd2c5f1b01172f2d0c9fb195f6e18329f2880adb2774406684cbc4c0 b2sums = 2d9d5cf410b74c9eb9238a469ff04cd3c4223716c51fa6431abb36c3d31e13ce2bea7179df392e92c23e615ee9d4f34ff156aefa2ea9bf6a2754b2079fcad5db @@ -49,6 +50,7 @@ pkgbase = broadcom-wl-dkms b2sums = ca3aa742339bbe767916c8e2b62ec0b96e0e3f9b74bde55737fb98b7d71e97ecf7bf772fa9c4e8a50a4e8d821eeb8638d8d060c8e01de1a6fc7df58167459c38 b2sums = 89a234cfbe2ddf3c938fc33b846c29cbf67907919bc3b103405b4e020bbaeb615ad0fc884ec314b17ca9c3ac63256dea2387851383934b7483cfca67dccbed17 b2sums = 03e42e33a1fa2a1b64f36cd38f83ca431aa9d3914d52015bac6e4717071938e05c69c53f644653823a4a2a2278243a4d8564477597e8cae28bdb017615b4b102 + b2sums = bf7b311155338d9bd2ea087aa24b5601f3ca291c2aaf6509ad6c196f956f8d8311487a30965eb1db562f6caa3fddb2537e4246519582ceb0ca4e8d07ac4027ee b2sums = e9d01c1a1a63c07f720e3ee53ee3ef634ab12694135300cb0ce47ade0e9e0084967a0b6df64d983e8184240eb3defb128f650bddb7727e901d50315307f3398a pkgname = broadcom-wl-dkms ===================================== 019-linux614.patch ===================================== @@ -0,0 +1,34 @@ +From: Eduard Bloch <[email protected]> +Date: Sun, 16 Mar 2025 16:13:08 +0100 +Subject: Prepare for 6.14.0-rc6 + +--- + src/wl/sys/wl_cfg80211_hybrid.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index 2c865c1..e23ef83 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -98,7 +98,9 @@ static s32 wl_cfg80211_set_tx_power(struct wiphy *wiphy, + enum tx_power_setting type, s32 mbm); + #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, u32 /*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); +@@ -1159,7 +1161,9 @@ wl_cfg80211_set_tx_power(struct wiphy *wiphy, enum tx_power_setting type, s32 mb + 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, u32 /*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) ===================================== PKGBUILD ===================================== @@ -6,7 +6,7 @@ pkgname=broadcom-wl-dkms pkgver=6.30.223.271 -pkgrel=41 +pkgrel=42 pkgdesc='Broadcom 802.11 Linux STA wireless driver' arch=(x86_64) url='https://www.broadcom.com/site-search?filters[pages][content_type][values][]=Downloads&q=802.11%20linux%20sta%20wireless%20driver' @@ -34,6 +34,7 @@ source=(broadcom-wl-dkms.conf 016-linux601.patch 017-linux612.patch 018-linux613.patch + 019-linux614.patch "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz";) b2sums=('7c4eaa825a37358509a08e5105665eeabc9f097945b6fa163cd5722b00638da5889f5466bd2c5f1b01172f2d0c9fb195f6e18329f2880adb2774406684cbc4c0' '2d9d5cf410b74c9eb9238a469ff04cd3c4223716c51fa6431abb36c3d31e13ce2bea7179df392e92c23e615ee9d4f34ff156aefa2ea9bf6a2754b2079fcad5db' @@ -55,6 +56,7 @@ b2sums=('7c4eaa825a37358509a08e5105665eeabc9f097945b6fa163cd5722b00638da5889f546 'ca3aa742339bbe767916c8e2b62ec0b96e0e3f9b74bde55737fb98b7d71e97ecf7bf772fa9c4e8a50a4e8d821eeb8638d8d060c8e01de1a6fc7df58167459c38' '89a234cfbe2ddf3c938fc33b846c29cbf67907919bc3b103405b4e020bbaeb615ad0fc884ec314b17ca9c3ac63256dea2387851383934b7483cfca67dccbed17' '03e42e33a1fa2a1b64f36cd38f83ca431aa9d3914d52015bac6e4717071938e05c69c53f644653823a4a2a2278243a4d8564477597e8cae28bdb017615b4b102' + 'bf7b311155338d9bd2ea087aa24b5601f3ca291c2aaf6509ad6c196f956f8d8311487a30965eb1db562f6caa3fddb2537e4246519582ceb0ca4e8d07ac4027ee' 'e9d01c1a1a63c07f720e3ee53ee3ef634ab12694135300cb0ce47ade0e9e0084967a0b6df64d983e8184240eb3defb128f650bddb7727e901d50315307f3398a') prepare() { View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/broadcom-wl-dkms/-/commit/fe6f778b993998d7f67b76137192cbace470fb09 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/broadcom-wl-dkms/-/commit/fe6f778b993998d7f67b76137192cbace470fb09 You're receiving this email because of your account on gitlab.archlinux.org.
