Merge pull request #9522 from heitbaum/bcm_sta

bcm_sta: drop wireless card driver
2025-07-29 13:46:49 +00:00 · 2024-11-23 15:35:59 +04:00 · 2024-11-23 15:35:59 +04:00 · 4a86ee89eb
commit 4a86ee89eb
parent edd6ecc6ef 0a8eeb43ad
23 changed files with 1 additions and 1459 deletions
--- a/packages/linux-drivers/bcm_sta/package.mk
+++ b/packages/linux-drivers/bcm_sta/package.mk
@ -1,27 +0,0 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 # Downloadlocation:
 # http://www.broadcom.com/support/802.11/linux_sta.php
 PKG_NAME="bcm_sta"
 PKG_VERSION="6.30.223.271"
 PKG_SHA256="959bcd1e965d294304a4e290cb8e47b7c74b9763094eff4d0b8e6cfb68a6895b"
 PKG_ARCH="x86_64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com/"
 PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_LONGDESC="Broadcom's BCM4311-, BCM4312-, BCM4313-, BCM4321-, BCM4322-, BCM43224-, and BCM43225-based WLAN driver."
 PKG_TOOLCHAIN="manual"
 PKG_IS_KERNEL_PKG="yes"
 make_target() {
  cd x86-64
    KBUILD_NOPEDANTIC=1 kernel_make V=1 CC=${CC} -C $(kernel_path) M=$(pwd) BINARCH=${TARGET_KERNEL_ARCH}
 }
 makeinstall_target() {
  mkdir -p ${INSTALL}/$(get_full_module_dir)/bcm_sta
    cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
 }
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0001-change-eth-to-wlan.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0001-change-eth-to-wlan.patch
@ -1,25 +0,0 @@
 From c51168b8481e84743b50d3d5cba18a4a0a188448 Mon Sep 17 00:00:00 2001
 From: Alberto Milone <alberto.milone@canonical.com>
 Date: Fri, 22 Nov 2013 10:07:33 +0100
 Subject: [PATCH 1/1] Change the network interface name from eth to wlan
 Thanks to Shuduo Sang for the patch.
 ---
 src/wl/sys/wl_linux.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/x86-64/src/wl/sys/wl_linux.c b/x86-64/src/wl/sys/wl_linux.c
 index 3ead3c3..b662ff7 100644
 --- a/x86-64/src/wl/sys/wl_linux.c
 +++ b/x86-64/src/wl/sys/wl_linux.c
@@ -235,7 +235,7 @@ module_param(nompc, int, 0);
 #define to_str(s) #s
 #define quote_str(s) to_str(s)
 -#define BRCM_WLAN_IFNAME eth%d
 +#define BRCM_WLAN_IFNAME wlan%d
 static char intf_name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME);
 -- 
 1.7.9.5
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0002-user_ioctl.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0002-user_ioctl.patch
@ -1,15 +0,0 @@
 --- a/x86-64/src/wl/sys/wl_linux.c
 +++ b/x86-64/src/wl/sys/wl_linux.c
@@ -1659,11 +1659,7 @@
 	}
 	WL_LOCK(wl);
 -	if (!capable(CAP_NET_ADMIN)) {
 -		bcmerror = BCME_EPERM;
 -	} else {
 -		bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif);
 -	}
 +	bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif);
 	WL_UNLOCK(wl);
 done1:
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0003-remove-date-time-macros.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0003-remove-date-time-macros.patch
@ -1,22 +0,0 @@
 --- a/x86-64/src/wl/sys/wl_linux.c
 +++ b/x86-64/src/wl/sys/wl_linux.c
@@ -724,7 +724,7 @@ wl_attach(uint16 vendor, uint16 device,
 		WL_ALL_PASSIVE_ENAB(wl) ?  ", Passive Mode" : "", EPI_VERSION_STR);
 #ifdef BCMDBG
 -	printf(" (Compiled in " SRCBASE " at " __TIME__ " on " __DATE__ ")");
 +	printf(" (Compiled in " SRCBASE ")");
 #endif 
 	printf("\n");
@@ -2049,8 +2049,7 @@ wl_osl_pcie_rc(struct wl_info *wl, uint
 void
 wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b)
 {
 -	bcm_bprintf(b, "wl%d: %s %s version %s\n", wl->pub->unit,
 -		__DATE__, __TIME__, EPI_VERSION_STR);
 +	bcm_bprintf(b, "wl%d: version %s\n", wl->pub->unit, EPI_VERSION_STR);
 }
 #if defined(BCMDBG)
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0004-null-pointer-crash.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0004-null-pointer-crash.patch
@ -1,11 +0,0 @@
 --- a/x86-64/src/wl/sys/wl_linux.c
 +++ b/x86-64/src/wl/sys/wl_linux.c
@@ -2160,8 +2160,8 @@ wl_start(struct sk_buff *skb, struct net
 	wlif = WL_DEV_IF(dev);
 	wl = WL_INFO(dev);
 +	skb->prev = NULL;
 	if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
 -		skb->prev = NULL;
 		TXQ_LOCK(wl);
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0005-rdtscl.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0005-rdtscl.patch
@ -1,15 +0,0 @@
 --- a/x86-64/src/shared/linux_osl.c	2015-09-19 01:47:15.000000000 +0300
 +++ b/x86-64/src/shared/linux_osl.c	2015-11-21 15:20:30.585902518 +0200
@@ -932,7 +932,11 @@
 	uint cycles;
 #if defined(__i386__)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
 +	cycles = (u32)rdtsc();
 +#else
 	rdtscl(cycles);
 +#endif
 #else
 	cycles = 0;
 #endif
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0006-kernel-4.7.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0006-kernel-4.7.patch
@ -1,198 +0,0 @@
 diff -Naur a/x86-32/src/wl/sys/wl_cfg80211_hybrid.c b/x86-32/src/wl/sys/wl_cfg80211_hybrid.c
 --- a/x86-32/src/wl/sys/wl_cfg80211_hybrid.c	2016-06-23 14:26:16.911221749 +0100
 +++ b/x86-32/src/wl/sys/wl_cfg80211_hybrid.c	2016-06-23 14:26:49.071406220 +0100
@@ -236,7 +236,7 @@
 #endif				
 #define CHAN2G(_channel, _freq, _flags) {			\
 -	.band			= IEEE80211_BAND_2GHZ,		\
 +	.band			= NL80211_BAND_2GHZ,		\
 	.center_freq		= (_freq),			\
 	.hw_value		= (_channel),			\
 	.flags			= (_flags),			\
@@ -245,7 +245,7 @@
 }
 #define CHAN5G(_channel, _flags) {				\
 -	.band			= IEEE80211_BAND_5GHZ,		\
 +	.band			= NL80211_BAND_5GHZ,		\
 	.center_freq		= 5000 + (5 * (_channel)),	\
 	.hw_value		= (_channel),			\
 	.flags			= (_flags),			\
@@ -379,7 +379,7 @@
 };
 static struct ieee80211_supported_band __wl_band_2ghz = {
 -	.band = IEEE80211_BAND_2GHZ,
 +	.band = NL80211_BAND_2GHZ,
 	.channels = __wl_2ghz_channels,
 	.n_channels = ARRAY_SIZE(__wl_2ghz_channels),
 	.bitrates = wl_g_rates,
@@ -387,7 +387,7 @@
 };
 static struct ieee80211_supported_band __wl_band_5ghz_a = {
 -	.band = IEEE80211_BAND_5GHZ,
 +	.band = NL80211_BAND_5GHZ,
 	.channels = __wl_5ghz_a_channels,
 	.n_channels = ARRAY_SIZE(__wl_5ghz_a_channels),
 	.bitrates = wl_a_rates,
@@ -395,7 +395,7 @@
 };
 static struct ieee80211_supported_band __wl_band_5ghz_n = {
 -	.band = IEEE80211_BAND_5GHZ,
 +	.band = NL80211_BAND_5GHZ,
 	.channels = __wl_5ghz_n_channels,
 	.n_channels = ARRAY_SIZE(__wl_5ghz_n_channels),
 	.bitrates = wl_a_rates,
@@ -1876,8 +1876,8 @@
 	wdev->wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX;
 #endif
 	wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
 -	wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz;
 -	wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_a; 
 +	wdev->wiphy->bands[NL80211_BAND_2GHZ] = &__wl_band_2ghz;
 +	wdev->wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_a; 
 	wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
 	wdev->wiphy->cipher_suites = __wl_cipher_suites;
 	wdev->wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);
@@ -2000,7 +2000,7 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel,
 		(notif_bss_info->channel <= CH_MAX_2G_CHANNEL) ?
 -		IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
 +		NL80211_BAND_2GHZ : NL80211_BAND_5GHZ);
 #else
 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel);
 #endif
@@ -2116,7 +2116,7 @@
 				return err;
 			}
 			chan = wf_chspec_ctlchan(chanspec);
 -			band = (chan <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
 +			band = (chan <= CH_MAX_2G_CHANNEL) ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
 			freq = ieee80211_channel_to_frequency(chan, band);
 			channel = ieee80211_get_channel(wiphy, freq);
 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
@@ -2250,10 +2250,10 @@
 		join_params->params.chanspec_list[0] =
 		    ieee80211_frequency_to_channel(chan->center_freq);
 -		if (chan->band == IEEE80211_BAND_2GHZ) {
 +		if (chan->band == NL80211_BAND_2GHZ) {
 			chanspec |= WL_CHANSPEC_BAND_2G;
 		}
 -		else if (chan->band == IEEE80211_BAND_5GHZ) {
 +		else if (chan->band == NL80211_BAND_5GHZ) {
 			chanspec |= WL_CHANSPEC_BAND_5G;
 		}
 		else {
@@ -2885,7 +2885,7 @@
 	if (phy == 'n' || phy == 'a' || phy == 'v') {
 		wiphy = wl_to_wiphy(wl);
 -		wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_n;
 +		wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_n;
 	}
 	return err;
 diff -Naur a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
 --- a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c	2016-06-23 14:26:22.639254590 +0100
 +++ b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c	2016-06-23 14:27:01.507477603 +0100
@@ -236,7 +236,7 @@
 #endif				
 #define CHAN2G(_channel, _freq, _flags) {			\
 -	.band			= IEEE80211_BAND_2GHZ,		\
 +	.band			= NL80211_BAND_2GHZ,		\
 	.center_freq		= (_freq),			\
 	.hw_value		= (_channel),			\
 	.flags			= (_flags),			\
@@ -245,7 +245,7 @@
 }
 #define CHAN5G(_channel, _flags) {				\
 -	.band			= IEEE80211_BAND_5GHZ,		\
 +	.band			= NL80211_BAND_5GHZ,		\
 	.center_freq		= 5000 + (5 * (_channel)),	\
 	.hw_value		= (_channel),			\
 	.flags			= (_flags),			\
@@ -379,7 +379,7 @@
 };
 static struct ieee80211_supported_band __wl_band_2ghz = {
 -	.band = IEEE80211_BAND_2GHZ,
 +	.band = NL80211_BAND_2GHZ,
 	.channels = __wl_2ghz_channels,
 	.n_channels = ARRAY_SIZE(__wl_2ghz_channels),
 	.bitrates = wl_g_rates,
@@ -387,7 +387,7 @@
 };
 static struct ieee80211_supported_band __wl_band_5ghz_a = {
 -	.band = IEEE80211_BAND_5GHZ,
 +	.band = NL80211_BAND_5GHZ,
 	.channels = __wl_5ghz_a_channels,
 	.n_channels = ARRAY_SIZE(__wl_5ghz_a_channels),
 	.bitrates = wl_a_rates,
@@ -395,7 +395,7 @@
 };
 static struct ieee80211_supported_band __wl_band_5ghz_n = {
 -	.band = IEEE80211_BAND_5GHZ,
 +	.band = NL80211_BAND_5GHZ,
 	.channels = __wl_5ghz_n_channels,
 	.n_channels = ARRAY_SIZE(__wl_5ghz_n_channels),
 	.bitrates = wl_a_rates,
@@ -1876,8 +1876,8 @@
 	wdev->wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX;
 #endif
 	wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
 -	wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz;
 -	wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_a; 
 +	wdev->wiphy->bands[NL80211_BAND_2GHZ] = &__wl_band_2ghz;
 +	wdev->wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_a; 
 	wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
 	wdev->wiphy->cipher_suites = __wl_cipher_suites;
 	wdev->wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);
@@ -2000,7 +2000,7 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel,
 		(notif_bss_info->channel <= CH_MAX_2G_CHANNEL) ?
 -		IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
 +		NL80211_BAND_2GHZ : NL80211_BAND_5GHZ);
 #else
 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel);
 #endif
@@ -2116,7 +2116,7 @@
 				return err;
 			}
 			chan = wf_chspec_ctlchan(chanspec);
 -			band = (chan <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
 +			band = (chan <= CH_MAX_2G_CHANNEL) ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
 			freq = ieee80211_channel_to_frequency(chan, band);
 			channel = ieee80211_get_channel(wiphy, freq);
 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
@@ -2250,10 +2250,10 @@
 		join_params->params.chanspec_list[0] =
 		    ieee80211_frequency_to_channel(chan->center_freq);
 -		if (chan->band == IEEE80211_BAND_2GHZ) {
 +		if (chan->band == NL80211_BAND_2GHZ) {
 			chanspec |= WL_CHANSPEC_BAND_2G;
 		}
 -		else if (chan->band == IEEE80211_BAND_5GHZ) {
 +		else if (chan->band == NL80211_BAND_5GHZ) {
 			chanspec |= WL_CHANSPEC_BAND_5G;
 		}
 		else {
@@ -2885,7 +2885,7 @@
 	if (phy == 'n' || phy == 'a' || phy == 'v') {
 		wiphy = wl_to_wiphy(wl);
 -		wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_n;
 +		wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_n;
 	}
 	return err;
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0007-kernel-4.8.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0007-kernel-4.8.patch
@ -1,96 +0,0 @@
 diff -Naur a/x86-32/src/wl/sys/wl_cfg80211_hybrid.c b/x86-32/src/wl/sys/wl_cfg80211_hybrid.c
 --- a/x86-32/src/wl/sys/wl_cfg80211_hybrid.c	2016-09-11 01:59:36.987804240 +0100
 +++ b/x86-32/src/wl/sys/wl_cfg80211_hybrid.c	2016-09-11 02:02:44.876069294 +0100
@@ -2387,7 +2387,14 @@
 	if (wl->scan_request) {
 		WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
 +		struct cfg80211_scan_info info = {
 +			.aborted = true
 +		};
 +		cfg80211_scan_done(wl->scan_request, &info);     
 +#else
 		cfg80211_scan_done(wl->scan_request, true);     
 +#endif
 		wl->scan_request = NULL;
 	}
@@ -2488,7 +2495,14 @@
 scan_done_out:
 	if (wl->scan_request) {
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
 +		struct cfg80211_scan_info info = {
 +			.aborted = false
 +		};
 +		cfg80211_scan_done(wl->scan_request, &info);
 +#else
 		cfg80211_scan_done(wl->scan_request, false);
 +#endif
 		wl->scan_request = NULL;
 	}
 	rtnl_unlock();
@@ -2913,7 +2927,14 @@
 	s32 err = 0;
 	if (wl->scan_request) {
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
 +		struct cfg80211_scan_info info = {
 +			.aborted = true
 +		};
 +		cfg80211_scan_done(wl->scan_request, &info);	
 +#else
 		cfg80211_scan_done(wl->scan_request, true);	
 +#endif
 		wl->scan_request = NULL;
 	}
 diff -Naur a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
 --- a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c	2016-09-11 01:59:50.796117742 +0100
 +++ b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c	2016-09-11 02:04:12.290053058 +0100
@@ -2387,7 +2387,14 @@
 	if (wl->scan_request) {
 		WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
 +		struct cfg80211_scan_info info = {
 +			.aborted = true
 +		};
 +		cfg80211_scan_done(wl->scan_request, &info);     
 +#else
 		cfg80211_scan_done(wl->scan_request, true);     
 +#endif
 		wl->scan_request = NULL;
 	}
@@ -2488,7 +2495,14 @@
 scan_done_out:
 	if (wl->scan_request) {
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
 +		struct cfg80211_scan_info info = {
 +			.aborted = false
 +		};
 +		cfg80211_scan_done(wl->scan_request, &info);
 +#else
 		cfg80211_scan_done(wl->scan_request, false);
 +#endif
 		wl->scan_request = NULL;
 	}
 	rtnl_unlock();
@@ -2913,7 +2927,14 @@
 	s32 err = 0;
 	if (wl->scan_request) {
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
 +		struct cfg80211_scan_info info = {
 +			.aborted = true
 +		};
 +		cfg80211_scan_done(wl->scan_request, &info);	
 +#else
 		cfg80211_scan_done(wl->scan_request, true);	
 +#endif
 		wl->scan_request = NULL;
 	}
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0008-kernel-4.11.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0008-kernel-4.11.patch
@ -1,68 +0,0 @@
 From 7e8dddb7a545bc5ba74336ef2aafed1c0b4ceee1 Mon Sep 17 00:00:00 2001
 From: MilhouseVH <milhouseVH.github@nmacleod.com>
 Date: Mon, 13 Mar 2017 20:48:44 +0000
 Subject: [PATCH 1/2] bcm_sta: Fix build for API changes in kernel 4.11
 ---
 x86-64/src/wl/sys/wl_cfg80211_hybrid.c | 4 ++++
 x86-64/src/wl/sys/wl_linux.c           | 4 ++++
 2 files changed, 8 insertions(+)
 diff --git a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
 index 7b606e0..76ef208 100644
 --- a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
 +++ b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
@@ -26,6 +26,10 @@
 #include <linuxver.h>
 #include <osl.h>
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
 +#include <linux/sched/signal.h>
 +#endif
 +
 #include <linux/kernel.h>
 #include <linux/kthread.h>
 #include <linux/netdevice.h>
 diff --git a/x86-64/src/wl/sys/wl_linux.c b/x86-64/src/wl/sys/wl_linux.c
 index 0d05100..dca7c71 100644
 --- a/x86-64/src/wl/sys/wl_linux.c
 +++ b/x86-64/src/wl/sys/wl_linux.c
@@ -26,6 +26,10 @@
 #include <typedefs.h>
 #include <linuxver.h>
 #include <osl.h>
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
 +#include <linux/sched/signal.h>
 +#endif
 +
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
 #include <linux/module.h>
 #endif
 -- 
 2.7.4
 From 1d066a57a682af0ac42b8d1c65bf7bd1984a54ca Mon Sep 17 00:00:00 2001
 From: MilhouseVH <milhouseVH.github@nmacleod.com>
 Date: Mon, 13 Mar 2017 20:49:01 +0000
 Subject: [PATCH 2/2] bcm_sta: Remove usage of net_device last_rx member
 ---
 x86-64/src/wl/sys/wl_linux.c | 1 -
 1 file changed, 1 deletion(-)
 diff --git a/x86-64/src/wl/sys/wl_linux.c b/x86-64/src/wl/sys/wl_linux.c
 index dca7c71..f3be019 100644
 --- a/x86-64/src/wl/sys/wl_linux.c
 +++ b/x86-64/src/wl/sys/wl_linux.c
@@ -2919,7 +2919,6 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p)
 	if (skb == NULL) return;
 	skb->dev = wl->monitor_dev;
 -	skb->dev->last_rx = jiffies;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
 	skb_reset_mac_header(skb);
 #else
 -- 
 2.7.4
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0009-kernel-4.12.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0009-kernel-4.12.patch
@ -1,75 +0,0 @@
 From 268500240a551436c5003f5843ff4d090bf3e202 Mon Sep 17 00:00:00 2001
 From: MilhouseVH <milhouseVH.github@nmacleod.com>
 Date: Thu, 18 May 2017 12:52:55 +0100
 Subject: [PATCH] Fix build with kernel 4.12-rc1
 ---
 x86-64/src/wl/sys/wl_cfg80211_hybrid.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 diff --git a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
 index 7b606e0..cedf95c 100644
 --- a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
 +++ b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
@@ -49,8 +49,13 @@ u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_INFO;
 u32 wl_dbg_level = WL_DBG_ERR;
 #endif
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
 +static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
 +           enum nl80211_iftype type, struct vif_params *params);
 +#else
 static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
            enum nl80211_iftype type, u32 *flags, struct vif_params *params);
 +#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
 static s32
 wl_cfg80211_scan(struct wiphy *wiphy,
@@ -461,10 +466,16 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
 	return err;
 }
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
 +static s32
 +wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
 +                         enum nl80211_iftype type, struct vif_params *params)
 +#else
 static s32
 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
                          enum nl80211_iftype type, u32 *flags,
    struct vif_params *params)
 +#endif
 {
 	struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
 	struct wireless_dev *wdev;
@@ -2364,6 +2375,19 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
 	memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN);
 	memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
 	wl_update_bss_info(wl);
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
 +	{
 +		struct cfg80211_roam_info roam_info = {
 +			.channel = &wl->conf->channel,
 +			.bssid = (u8 *)&wl->bssid,
 +			.req_ie = conn_info->req_ie,
 +			.req_ie_len = conn_info->req_ie_len,
 +			.resp_ie = conn_info->resp_ie,
 +			.resp_ie_len = conn_info->resp_ie_len,
 +		};
 +		cfg80211_roamed(ndev, &roam_info, GFP_KERNEL);
 +	}
 +#else
 	cfg80211_roamed(ndev,
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
 			&wl->conf->channel,	 
@@ -2371,6 +2395,7 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
 			(u8 *)&wl->bssid,
 			conn_info->req_ie, conn_info->req_ie_len,
 			conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
 +#endif
 	WL_DBG(("Report roaming result\n"));
 	set_bit(WL_STATUS_CONNECTED, &wl->status);
 -- 
 2.7.4
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0010-kernel-4.15.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0010-kernel-4.15.patch
@ -1,61 +0,0 @@
 From a893fac9b9e883f39a545e8ce87926cecc26ba12 Mon Sep 17 00:00:00 2001
 From: MilhouseVH <milhouseVH.github@nmacleod.com>
 Date: Sun, 10 Jun 2018 19:13:17 +0100
 Subject: [PATCH] add 4.15.y support
 Credit: https://github.com/UnitedRPMs/broadcom-wl-dkms/blob/5147b5f1867273e2762f777fd724b6523c3ab8dd/008-linux415.patch
 ---
 x86-64/src/wl/sys/wl_linux.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 diff --git a/x86-64/src/wl/sys/wl_linux.c b/x86-64/src/wl/sys/wl_linux.c
 index f7149da..89a3831 100644
 --- a/x86-64/src/wl/sys/wl_linux.c
 +++ b/x86-64/src/wl/sys/wl_linux.c
@@ -97,7 +97,11 @@ struct iw_statistics *wl_get_wireless_stats(struct net_device *dev);
 #include <wlc_wowl.h>
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
 +static void wl_timer(struct timer_list *tl);
 +#else
 static void wl_timer(ulong data);
 +#endif
 static void _wl_timer(wl_timer_t *t);
 static struct net_device *wl_alloc_linux_if(wl_if_t *wlif);
@@ -2296,10 +2300,17 @@ wl_timer_task(wl_task_t *task)
 	atomic_dec(&t->wl->callbacks);
 }
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
 +static void
 +wl_timer(struct timer_list *tl)
 +{
 +	wl_timer_t *t = (wl_timer_t *)tl;
 +#else
 static void
 wl_timer(ulong data)
 {
 	wl_timer_t *t = (wl_timer_t *)data;
 +#endif
 	if (!WL_ALL_PASSIVE_ENAB(t->wl))
 		_wl_timer(t);
@@ -2351,9 +2362,13 @@ wl_init_timer(wl_info_t *wl, void (*fn)(void *arg), void *arg, const char *tname
 	bzero(t, sizeof(wl_timer_t));
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
 +	timer_setup(&t->timer, wl_timer, 0);
 +#else
 	init_timer(&t->timer);
 	t->timer.data = (ulong) t;
 	t->timer.function = wl_timer;
 +#endif
 	t->wl = wl;
 	t->fn = fn;
 	t->arg = arg;
 -- 
 2.14.1
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0011-fix-kernel-warnings.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0011-fix-kernel-warnings.patch
@ -1,177 +0,0 @@
 From 6bc816ae3ef424bc52b2736aeb1eb08ab09f38a9 Mon Sep 17 00:00:00 2001
 From: MilhouseVH <milhouseVH.github@nmacleod.com>
 Date: Sun, 10 Jun 2018 19:32:39 +0100
 Subject: [PATCH] fix kernel warnings
 Credit: https://github.com/UnitedRPMs/broadcom-wl-dkms/blob/master/wl-kmod-008_fix_kernel_warnings.patch
 ---
 x86-64/src/wl/sys/wl_cfg80211_hybrid.c | 88 +++++++++++++++++++++++-----------
 1 file changed, 60 insertions(+), 28 deletions(-)
 diff --git a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
 index 2e8625d..4da9b38 100644
 --- a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
 +++ b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
@@ -1983,7 +1983,7 @@ static s32 wl_inform_single_bss(struct wl_cfg80211_priv *wl, struct wl_bss_info
 	if (dtoh32(bi->length) > WL_BSS_INFO_MAX) {
 		WL_DBG(("Beacon is larger than buffer. Discarding\n"));
 -		return err;
 +		return -E2BIG;
 	}
 	notif_bss_info = kzalloc(sizeof(*notif_bss_info) + sizeof(*mgmt) - sizeof(u8) +
 	                         WL_BSS_INFO_MAX, GFP_KERNEL);
@@ -2007,9 +2007,15 @@ static s32 wl_inform_single_bss(struct wl_cfg80211_priv *wl, struct wl_bss_info
 	beacon_proberesp->capab_info = cpu_to_le16(bi->capability);
 	wl_rst_ie(wl);
 -	wl_mrg_ie(wl, ((u8 *) bi) + bi->ie_offset, bi->ie_length);
 -	wl_cp_ie(wl, beacon_proberesp->variable, WL_BSS_INFO_MAX -
 -	         offsetof(struct wl_cfg80211_bss_info, frame_buf));
 +	err = wl_mrg_ie(wl, ((u8 *) bi) + bi->ie_offset, bi->ie_length);
 +	if (err)
 +		goto inform_single_bss_out;
 +
 +	err = wl_cp_ie(wl, beacon_proberesp->variable, WL_BSS_INFO_MAX -
 +	               offsetof(struct wl_cfg80211_bss_info, frame_buf));
 +	if (err)
 +		goto inform_single_bss_out;
 +
 	notif_bss_info->frame_len = offsetof(struct ieee80211_mgmt, u.beacon.variable) +
 	                            wl_get_ielen(wl);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
@@ -2021,14 +2027,14 @@ static s32 wl_inform_single_bss(struct wl_cfg80211_priv *wl, struct wl_bss_info
 #endif
 	if (freq == 0) {
 		WL_ERR(("Invalid channel, fail to chcnage channel to freq\n"));
 -		kfree(notif_bss_info);
 -		return -EINVAL;
 +		err = -EINVAL;
 +		goto inform_single_bss_out;
 	}
 	channel = ieee80211_get_channel(wiphy, freq);
 	if (unlikely(!channel)) {
 		WL_ERR(("ieee80211_get_channel error\n"));
 -		kfree(notif_bss_info);
 -		return -EINVAL;
 +		err = -EINVAL;
 +		goto inform_single_bss_out;
 	}
 	WL_DBG(("SSID : \"%s\", rssi %d, channel %d, capability : 0x04%x, bssid %pM\n",
@@ -2036,28 +2042,35 @@ static s32 wl_inform_single_bss(struct wl_cfg80211_priv *wl, struct wl_bss_info
 		mgmt->u.beacon.capab_info, &bi->BSSID));
 	signal = notif_bss_info->rssi * 100;
 -	cbss = cfg80211_inform_bss_frame(wiphy, channel, mgmt,
 -	    le16_to_cpu(notif_bss_info->frame_len), signal, GFP_KERNEL);
 -	if (unlikely(!cbss)) {
 -		WL_ERR(("cfg80211_inform_bss_frame error\n"));
 -		kfree(notif_bss_info);
 -		return -EINVAL;
 +	if (!wl->scan_request) {
 +		cbss = cfg80211_inform_bss_frame(wiphy, channel, mgmt,
 +		    le16_to_cpu(notif_bss_info->frame_len), signal, GFP_KERNEL);
 +		if (unlikely(!cbss)) {
 +			WL_ERR(("cfg80211_inform_bss_frame error\n"));
 +			err = -ENOMEM;
 +			goto inform_single_bss_out;
 +		}
 	}
 -
 -	notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);
 -	notify_ielen = le32_to_cpu(bi->ie_length);
 +	else {
 +		notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);
 +		notify_ielen = le32_to_cpu(bi->ie_length);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
 -	cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet),
 -		0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
 -		(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
 +		cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet),
 +			0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
 +			(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
 #else
 -	cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, (const u8 *)(bi->BSSID.octet),
 -		0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
 -		(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
 +		cbss = cfg80211_inform_bss(wiphy, channel,
 +		    wl->active_scan ? CFG80211_BSS_FTYPE_PRESP : CFG80211_BSS_FTYPE_BEACON,
 +		    (const u8 *)(bi->BSSID.octet),
 +		    0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
 +		    (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
 #endif
 -
 -	if (unlikely(!cbss))
 -		return -ENOMEM;
 +		if (unlikely(!cbss)) {
 +			WL_ERR(("cfg80211_inform_bss error\n"));
 +			err = -ENOMEM;
 +			goto inform_single_bss_out;
 +		}
 +	}
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
 	cfg80211_put_bss(wiphy, cbss);
@@ -2065,6 +2078,7 @@ static s32 wl_inform_single_bss(struct wl_cfg80211_priv *wl, struct wl_bss_info
 	cfg80211_put_bss(cbss);
 #endif
 +inform_single_bss_out:
 	kfree(notif_bss_info);
 	return err;
@@ -2331,6 +2345,9 @@ static s32 wl_update_bss_info(struct wl_cfg80211_priv *wl)
 		if (err)
 			goto update_bss_info_out;
 +		bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
 +		      ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
 +
 		ie = ((u8 *)bi) + bi->ie_offset;
 		ie_len = bi->ie_length;
 	} else {
@@ -2343,12 +2360,20 @@ static s32 wl_update_bss_info(struct wl_cfg80211_priv *wl)
 		ie_len = bss->len_information_elements;
 #endif
 		wl->conf->channel = *bss->channel;
 +	}
 +
 +	if (bss) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
 		cfg80211_put_bss(wiphy, bss);
 #else
 		cfg80211_put_bss(bss);
 #endif
 	}
 +	else {
 +		WL_DBG(("Could not update BSS\n"));
 +		err = -EINVAL;
 +		goto update_bss_info_out;
 +	}
 	tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM);
 	if (tim) {
@@ -2375,10 +2400,17 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
 	struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
 	s32 err = 0;
 -	wl_get_assoc_ies(wl);
 +	err = wl_get_assoc_ies(wl);
 +	if (err)
 +		return err;
 +
 	memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN);
 	memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
 -	wl_update_bss_info(wl);
 +
 +	err = wl_update_bss_info(wl);
 +	if (err)
 +		return err;
 +
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
 	{
 		struct cfg80211_roam_info roam_info = {
 -- 
 2.14.1
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0012-kernel-4.14.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0012-kernel-4.14.patch
@ -1,29 +0,0 @@
 From d1dfd471bfc5bb4e9513e8a26ecb11de934dc27e Mon Sep 17 00:00:00 2001
 From: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
 Date: Fri, 15 Dec 2017 17:09:04 +0000
 Subject: [PATCH 25/26] add support for Linux 4.14
 Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
 ---
 src/shared/linux_osl.c | 4 ++++
 1 file changed, 4 insertions(+)
 diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c
 index 6157d1832767..318874541d89 100644
 --- a/x86-64/src/shared/linux_osl.c
 +++ b/x86-64/src/shared/linux_osl.c
@@ -1076,7 +1076,11 @@ osl_os_get_image_block(char *buf, int len, void *image)
 	if (!image)
 		return 0;
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
 +	rdlen = kernel_read(fp, buf, len, &fp->f_pos);
 +#else
 	rdlen = kernel_read(fp, fp->f_pos, buf, len);
 +#endif
 	if (rdlen > 0)
 		fp->f_pos += rdlen;
 -- 
 2.14.1
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0200-kernel-5.1-rc1-fix.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0200-kernel-5.1-rc1-fix.patch
@ -1,68 +0,0 @@
 From aa1fc45ace58d802d038857b6fed8af9d771fbcc Mon Sep 17 00:00:00 2001
 From: MilhouseVH <milhouseVH.github@nmacleod.com>
 Date: Mon, 18 Mar 2019 16:29:45 +0000
 Subject: [PATCH] get rid of legacy 'get_ds()' function
 https://github.com/torvalds/linux/commit/736706bee3298208343a76096370e4f6a5c55915
 ---
 x86-32/src/wl/sys/wl_cfg80211_hybrid.c | 2 +-
 x86-32/src/wl/sys/wl_iw.c              | 2 +-
 x86-64/src/wl/sys/wl_cfg80211_hybrid.c | 2 +-
 x86-64/src/wl/sys/wl_iw.c              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 diff --git a/x86-32/src/wl/sys/wl_cfg80211_hybrid.c b/x86-32/src/wl/sys/wl_cfg80211_hybrid.c
 index 7b606e0..51c81bc 100644
 --- a/x86-32/src/wl/sys/wl_cfg80211_hybrid.c
 +++ b/x86-32/src/wl/sys/wl_cfg80211_hybrid.c
@@ -450,7 +450,7 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
 	ifr.ifr_data = (caddr_t)&ioc;
 	fs = get_fs();
 -	set_fs(get_ds());
 +	set_fs(KERNEL_DS);
 #if defined(WL_USE_NETDEV_OPS)
 	err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
 #else
 diff --git a/x86-32/src/wl/sys/wl_iw.c b/x86-32/src/wl/sys/wl_iw.c
 index c4c610b..9c3c74e 100644
 --- a/x86-32/src/wl/sys/wl_iw.c
 +++ b/x86-32/src/wl/sys/wl_iw.c
@@ -117,7 +117,7 @@ dev_wlc_ioctl(
 	ifr.ifr_data = (caddr_t) &ioc;
 	fs = get_fs();
 -	set_fs(get_ds());
 +	set_fs(KERNEL_DS);
 #if defined(WL_USE_NETDEV_OPS)
 	ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
 #else
 diff --git a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
 index 7b606e0..51c81bc 100644
 --- a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
 +++ b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
@@ -450,7 +450,7 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
 	ifr.ifr_data = (caddr_t)&ioc;
 	fs = get_fs();
 -	set_fs(get_ds());
 +	set_fs(KERNEL_DS);
 #if defined(WL_USE_NETDEV_OPS)
 	err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
 #else
 diff --git a/x86-64/src/wl/sys/wl_iw.c b/x86-64/src/wl/sys/wl_iw.c
 index c4c610b..9c3c74e 100644
 --- a/x86-64/src/wl/sys/wl_iw.c
 +++ b/x86-64/src/wl/sys/wl_iw.c
@@ -117,7 +117,7 @@ dev_wlc_ioctl(
 	ifr.ifr_data = (caddr_t) &ioc;
 	fs = get_fs();
 -	set_fs(get_ds());
 +	set_fs(KERNEL_DS);
 #if defined(WL_USE_NETDEV_OPS)
 	ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
 #else
 -- 
 2.14.1
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0300-kernel-5.6-rc1-fix.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0300-kernel-5.6-rc1-fix.patch
@ -1,101 +0,0 @@
 From 5224fb9bcb82733be5f7d4e41134578f48399a9b Mon Sep 17 00:00:00 2001
 From: MilhouseVH <milhouseVH.github@nmacleod.com>
 Date: Mon, 10 Feb 2020 11:34:46 +0000
 Subject: [PATCH 1/2] proc_create_data: fix 5.6-rc1
 d56c0d45f0e27f814e87a1676b6bdccccbc252e9
 ---
 x86-64/src/wl/sys/wl_linux.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)
 diff --git a/x86-64/src/wl/sys/wl_linux.c b/x86-64/src/wl/sys/wl_linux.c
 index 0d05100..cbca645 100644
 --- a/x86-64/src/wl/sys/wl_linux.c
 +++ b/x86-64/src/wl/sys/wl_linux.c
@@ -3334,7 +3334,12 @@ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t
 	return length;
 }
 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
 +static const struct proc_ops wl_pops = {
 +	.proc_read	= wl_proc_read,
 +	.proc_write	= wl_proc_write,
 +};
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
 static const struct file_operations wl_fops = {
 	.owner	= THIS_MODULE,
 	.read	= wl_proc_read,
@@ -3347,12 +3352,15 @@ wl_reg_proc_entry(wl_info_t *wl)
 {
 	char tmp[32];
 	sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit);
 -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
 -	if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
 -		WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
 -#else
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
 +	if ((wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_pops, wl)) == NULL) {
 +		WL_ERROR(("%s: proc_create_data %s failed\n", __FUNCTION__, tmp));
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
 	if ((wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_fops, wl)) == NULL) {
 		WL_ERROR(("%s: proc_create_data %s failed\n", __FUNCTION__, tmp));
 +#else
 +	if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
 +		WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
 #endif
 		ASSERT(0);
 		return -1;
 -- 
 2.20.1
 From 8d32f5792ec56b0088d5b5e3b21d4cbc97389728 Mon Sep 17 00:00:00 2001
 From: MilhouseVH <milhouseVH.github@nmacleod.com>
 Date: Mon, 10 Feb 2020 11:46:35 +0000
 Subject: [PATCH 2/2] ioremap_nocache: fix 5.6-rc1
 6a1000bd27035bba17ede9dc915166276a811edb
 ---
 x86-64/src/shared/linux_osl.c | 2 +-
 x86-64/src/wl/sys/wl_linux.c  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 diff --git a/x86-64/src/shared/linux_osl.c b/x86-64/src/shared/linux_osl.c
 index 6157d18..8237ec7 100644
 --- a/x86-64/src/shared/linux_osl.c
 +++ b/x86-64/src/shared/linux_osl.c
@@ -942,7 +942,7 @@ osl_getcycles(void)
 void *
 osl_reg_map(uint32 pa, uint size)
 {
 -	return (ioremap_nocache((unsigned long)pa, (unsigned long)size));
 +	return (ioremap((unsigned long)pa, (unsigned long)size));
 }
 void
 diff --git a/x86-64/src/wl/sys/wl_linux.c b/x86-64/src/wl/sys/wl_linux.c
 index cbca645..4bb0162 100644
 --- a/x86-64/src/wl/sys/wl_linux.c
 +++ b/x86-64/src/wl/sys/wl_linux.c
@@ -582,7 +582,7 @@ wl_attach(uint16 vendor, uint16 device, ulong regs,
 	}
 	wl->bcm_bustype = bustype;
 -	if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
 +	if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
 		WL_ERROR(("wl%d: ioremap() failed\n", unit));
 		goto fail;
 	}
@@ -772,7 +772,7 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	if ((val & 0x0000ff00) != 0)
 		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
 		bar1_size = pci_resource_len(pdev, 2);
 -		bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2),
 +		bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2),
 			bar1_size);
 	wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev,
 		pdev->irq, bar1_addr, bar1_size);
 -- 
 2.20.1
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0400-kernel-5.9-fix.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0400-kernel-5.9-fix.patch
@ -1,12 +0,0 @@
 --- a/x86-64/src/wl/sys/wl_linux.c	2020-10-12 21:19:15.256305165 +0000
 +++ b/x86-64/src/wl/sys/wl_linux.c	2020-10-12 21:20:38.687530895 +0000
@@ -1643,7 +1643,7 @@
 		goto done2;
 	}
 -	if (segment_eq(get_fs(), KERNEL_DS))
 +	if (get_fs().seg == KERNEL_DS.seg)
 		buf = ioc.buf;
 	else if (ioc.buf) {
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0500-kernel-5.10-fix.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0500-kernel-5.10-fix.patch
@ -1,207 +0,0 @@
 From: Joan Bruguera <joanbrugueram@gmail.com>
 Date: Sun, 13 Sep 2020 07:33:32 +0200
 Subject: Get rid of get_fs/set_fs calls in Broadcom WL driver.
 Origin: https://gist.github.com/joanbm/5c640ac074d27fd1d82c74a5b67a1290
 Fixes linux-next where get_fs/set_fs is already removed for some architectures.
 NB: Some checks in wlc_ioctl_internal are likely superfluous,
    but I'm not familiar enough with the driver to remove them with confidence.
 See also: https://lwn.net/Articles/722267/
          https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/arch/x86/include/asm/uaccess.h?h=next-20200911&id=47058bb54b57962b3958a936ddbc59355e4c5504
          https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/include/linux/uaccess.h?h=next-20200911&id=5e6e9852d6f76e01b2e6803c74258afa5b432bc5
 Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
 ---
 x86-64/src/wl/sys/wl_cfg80211_hybrid.c | 29 ++-----------------------
 x86-64/src/wl/sys/wl_iw.c              | 25 ++--------------------
 x86-64/src/wl/sys/wl_linux.c           | 40 ++++++++++++++++++++++++++++++-----
 x86-64/src/wl/sys/wl_linux.h           |  2 ++
 x86-64/src/wl/sys/wlc_pub.h            |  1 +
 5 files changed, 42 insertions(+), 55 deletions(-)
 diff --git a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
 index 8e01841..111ec5a 100644
 --- a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
 +++ b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
@@ -41,6 +41,7 @@
 #include <wlioctl.h>
 #include <proto/802.11.h>
 #include <wl_cfg80211_hybrid.h>
 +#include <wl_linux.h>
 #define EVENT_TYPE(e) dtoh32((e)->event_type)
 #define EVENT_FLAGS(e) dtoh16((e)->flags)
@@ -445,30 +445,8 @@
 static s32
 wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
 {
 -	struct ifreq ifr;
 -	struct wl_ioctl ioc;
 -	mm_segment_t fs;
 -	s32 err = 0;
 -
 	BUG_ON(len < sizeof(int));
 -
 -	memset(&ioc, 0, sizeof(ioc));
 -	ioc.cmd = cmd;
 -	ioc.buf = arg;
 -	ioc.len = len;
 -	strcpy(ifr.ifr_name, dev->name);
 -	ifr.ifr_data = (caddr_t)&ioc;
 -
 -	fs = get_fs();
 -	set_fs(KERNEL_DS);
 -#if defined(WL_USE_NETDEV_OPS)
 -	err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
 -#else
 -	err = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
 -#endif
 -	set_fs(fs);
 -
 -	return err;
 +	return wlc_ioctl_internal(dev, cmd, arg, len);
 }
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
 diff --git a/x86-64/src/wl/sys/wl_iw.c b/x86-64/src/wl/sys/wl_iw.c
 index c4c610b..e346b15 100644
 --- a/x86-64/src/wl/sys/wl_iw.c
 +++ b/x86-64/src/wl/sys/wl_iw.c
@@ -37,6 +37,7 @@ typedef const struct si_pub	si_t;
 #include <wl_dbg.h>
 #include <wl_iw.h>
 +#include <wl_linux.h>
 extern bool wl_iw_conn_status_str(uint32 event_type, uint32 status,
 	uint32 reason, char* stringBuf, uint buflen);
@@ -104,29 +104,7 @@
 	int len
 )
 {
 -	struct ifreq ifr;
 -	wl_ioctl_t ioc;
 -	mm_segment_t fs;
 -	int ret;
 -
 -	memset(&ioc, 0, sizeof(ioc));
 -	ioc.cmd = cmd;
 -	ioc.buf = arg;
 -	ioc.len = len;
 -
 -	strcpy(ifr.ifr_name, dev->name);
 -	ifr.ifr_data = (caddr_t) &ioc;
 -
 -	fs = get_fs();
 -	set_fs(KERNEL_DS);
 -#if defined(WL_USE_NETDEV_OPS)
 -	ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
 -#else
 -	ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
 -#endif
 -	set_fs(fs);
 -
 -	return ret;
 +	return wlc_ioctl_internal(dev, cmd, arg, len);
 }
 static int
 diff --git a/x86-64/src/wl/sys/wl_linux.c b/x86-64/src/wl/sys/wl_linux.c
 index 66069d4..cc01d2b 100644
 --- a/x86-64/src/wl/sys/wl_linux.c
 +++ b/x86-64/src/wl/sys/wl_linux.c
@@ -1651,10 +1651,7 @@
 		goto done2;
 	}
 -	if (get_fs().seg == KERNEL_DS.seg)
 -		buf = ioc.buf;
 -
 -	else if (ioc.buf) {
 +	if (ioc.buf) {
 		if (!(buf = (void *) MALLOC(wl->osh, MAX(ioc.len, WLC_IOCTL_MAXLEN)))) {
 			bcmerror = BCME_NORESOURCE;
 			goto done2;
@@ -1681,7 +1678,7 @@ wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 	WL_UNLOCK(wl);
 done1:
 -	if (ioc.buf && (ioc.buf != buf)) {
 +	if (ioc.buf) {
 		if (copy_to_user(ioc.buf, buf, ioc.len))
 			bcmerror = BCME_BADADDR;
 		MFREE(wl->osh, buf, MAX(ioc.len, WLC_IOCTL_MAXLEN));
@@ -1694,6 +1691,39 @@ done2:
 	return (OSL_ERROR(bcmerror));
 }
 +int
 +wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len)
 +{
 +	wl_info_t *wl;
 +	wl_if_t *wlif;
 +	int bcmerror;
 +
 +	if (!dev)
 +		return -ENETDOWN;
 +
 +	wl = WL_INFO(dev);
 +	wlif = WL_DEV_IF(dev);
 +	if (wlif == NULL || wl == NULL || wl->dev == NULL)
 +		return -ENETDOWN;
 +
 +	bcmerror = 0;
 +
 +	WL_TRACE(("wl%d: wlc_ioctl_internal: cmd 0x%x\n", wl->pub->unit, cmd));
 +
 +	WL_LOCK(wl);
 +	if (!capable(CAP_NET_ADMIN)) {
 +		bcmerror = BCME_EPERM;
 +	} else {
 +		bcmerror = wlc_ioctl(wl->wlc, cmd, buf, len, wlif->wlcif);
 +	}
 +	WL_UNLOCK(wl);
 +
 +	ASSERT(VALID_BCMERROR(bcmerror));
 +	if (bcmerror != 0)
 +		wl->pub->bcmerror = bcmerror;
 +	return (OSL_ERROR(bcmerror));
 +}
 +
 static struct net_device_stats*
 wl_get_stats(struct net_device *dev)
 {
 diff --git a/x86-64/src/wl/sys/wl_linux.h b/x86-64/src/wl/sys/wl_linux.h
 index 5b1048e..c8c1f41 100644
 --- a/x86-64/src/wl/sys/wl_linux.h
 +++ b/x86-64/src/wl/sys/wl_linux.h
@@ -22,6 +22,7 @@
 #define _wl_linux_h_
 #include <wlc_types.h>
 +#include <wlc_pub.h>
 typedef struct wl_timer {
 	struct timer_list 	timer;
@@ -187,6 +188,7 @@ extern irqreturn_t wl_isr(int irq, void *dev_id, struct pt_regs *ptregs);
 extern int __devinit wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 extern void wl_free(wl_info_t *wl);
 extern int  wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
 +extern int wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len);
 extern struct net_device * wl_netdev_get(wl_info_t *wl);
 #endif 
 diff --git a/x86-64/src/wl/sys/wlc_pub.h b/x86-64/src/wl/sys/wlc_pub.h
 index 53a98b8..2b5a029 100644
 --- a/x86-64/src/wl/sys/wlc_pub.h
 +++ b/x86-64/src/wl/sys/wlc_pub.h
@@ -24,6 +24,7 @@
 #include <wlc_types.h>
 #include <wlc_utils.h>
 +#include <siutils.h>
 #include "proto/802.11.h"
 #include "proto/bcmevent.h"
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0600-kernel-5.17-fix.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0600-kernel-5.17-fix.patch
@ -1,80 +0,0 @@
 From 31b7849092c43805c7fbaf7518b99874aa1b310c Mon Sep 17 00:00:00 2001
 From: Joan Bruguera <joanbrugueram@gmail.com>
 Date: Wed, 12 Jan 2022 20:49:20 +0100
 Subject: [PATCH] Tentative fix for broadcom-wl 6.30.223.271 driver for Linux 5.17-rc1
 Set netdev->dev_addr through dev_addr_mod + PDE_DATA fix
 Since Linux 5.17 netdev->dev_addr is const and must be changed through
 dev_addr_mod, otherwise a warning is logged in dmesg and bad things may happen.
 NB: The #if is not wrong, dev_addr_mod is defined since Linux 5.15-rc1
 Plus a trivial fix for PDE_DATA.
 Applies on top of all the patches applied to broadcom-wl-dkms 6.30.223.271-28 on Arch Linux.
 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/x86-64/src/wl/sys/wl_linux.c
 +++ b/x86-64/src/wl/sys/wl_linux.c
@@ -93,6 +93,10 @@ struct iw_statistics *wl_get_wireless_stats(struct net_device *dev);
 #include <wlc_wowl.h>
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
 +#define PDE_DATA pde_data
 +#endif
 +
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
 static void wl_timer(struct timer_list *tl);
 #else
@@ -490,6 +494,12 @@ wl_if_setup(struct net_device *dev)
 #endif
 }
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
 +static inline void eth_hw_addr_set(struct net_device *dev, const void *addr) {
 +	memcpy(dev->dev_addr, addr, ETHER_ADDR_LEN);
 +}
 +#endif
 +
 static wl_info_t *
 wl_attach(uint16 vendor, uint16 device, ulong regs,
 	uint bustype, void *btparam, uint irq, uchar* bar1_addr, uint32 bar1_size)
@@ -634,7 +644,7 @@ wl_attach(uint16 vendor, uint16 device, ulong regs,
 			WL_ERROR(("wl%d: Error setting MAC ADDRESS\n", unit));
 	}
 #endif 
 -	bcopy(&wl->pub->cur_etheraddr, dev->dev_addr, ETHER_ADDR_LEN);
 +	eth_hw_addr_set(dev, wl->pub->cur_etheraddr.octet);
 	online_cpus = 1;
@@ -1835,7 +1845,7 @@ wl_set_mac_address(struct net_device *dev, void *addr)
 	WL_LOCK(wl);
 -	bcopy(sa->sa_data, dev->dev_addr, ETHER_ADDR_LEN);
 +	eth_hw_addr_set(dev, sa->sa_data);
 	err = wlc_iovar_op(wl->wlc, "cur_etheraddr", NULL, 0, sa->sa_data, ETHER_ADDR_LEN,
 		IOV_SET, (WL_DEV_IF(dev))->wlcif);
 	WL_UNLOCK(wl);
@@ -3010,7 +3020,7 @@ _wl_add_monitor_if(wl_task_t *task)
 	else
 		dev->type = ARPHRD_IEEE80211_RADIOTAP;
 -	bcopy(wl->dev->dev_addr, dev->dev_addr, ETHER_ADDR_LEN);
 +	eth_hw_addr_set(dev, wl->dev->dev_addr);
 #if defined(WL_USE_NETDEV_OPS)
 	dev->netdev_ops = &wl_netdev_monitor_ops;
 -- 
 2.35.1
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0600-kernel-5.18-fix.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0600-kernel-5.18-fix.patch
@ -1,66 +0,0 @@
 diff -Nur a/x86-64/src/shared/linux_osl.c b/x86-64/src/shared/linux_osl.c
 --- a/x86-64/src/shared/linux_osl.c	2022-04-24 11:17:29.148114284 +0000
 +++ b/x86-64/src/shared/linux_osl.c	2022-04-24 11:38:38.493710528 +0000
@@ -600,7 +600,11 @@
 	if (va)
 		*pap = (ulong)__virt_to_phys(va);
 #else
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
 	va = pci_alloc_consistent(osh->pdev, size, (dma_addr_t*)pap);
 +#else
 +	va = dma_alloc_coherent(&((struct pci_dev *)osh->pdev)->dev, size, (dma_addr_t*)pap, GFP_ATOMIC);
 +#endif
 #endif
 	return va;
 }
@@ -613,7 +617,11 @@
 #ifdef __ARM_ARCH_7A__
 	kfree(va);
 #else
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
 	pci_free_consistent(osh->pdev, size, va, (dma_addr_t)pa);
 +#else
 +	dma_free_coherent(&((struct pci_dev *)osh->pdev)->dev, size, va, (dma_addr_t)pa);
 +#endif
 #endif
 }
@@ -623,7 +631,11 @@
 	int dir;
 	ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
 	dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
 +#else
 +	dir = (direction == DMA_TX)? DMA_TO_DEVICE: DMA_FROM_DEVICE;
 +#endif
 #if defined(__ARM_ARCH_7A__) && defined(BCMDMASGLISTOSL)
 	if (dmah != NULL) {
@@ -656,7 +668,12 @@
 	}
 #endif 
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
 	return (pci_map_single(osh->pdev, va, size, dir));
 +#else
 +	return (dma_map_single(&((struct pci_dev *)osh->pdev)->dev, va, size, dir));
 +#endif 
 +	return 0;
 }
 void BCMFASTPATH
@@ -665,8 +681,13 @@
 	int dir;
 	ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
 	dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
 	pci_unmap_single(osh->pdev, (uint32)pa, size, dir);
 +#else
 +	dir = (direction == DMA_TX)? DMA_TO_DEVICE: DMA_FROM_DEVICE;
 +	dma_unmap_single(&((struct pci_dev *)osh->pdev)->dev, (uint32)pa, size, dir);
 +#endif
 }
 #if defined(BCMDBG_ASSERT)
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0600-kernel-6.0-fix.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0600-kernel-6.0-fix.patch
@ -1,17 +0,0 @@
 diff -Nur a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
 --- a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c	2022-08-15 14:06:51.943852581 +0000
 +++ b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c	2022-08-15 14:24:49.917982457 +0000
@@ -2393,8 +2393,13 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
 	{
 		struct cfg80211_roam_info roam_info = {
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0)
 +			.links[0].channel = &wl->conf->channel,
 +			.links[0].bssid = (u8 *)&wl->bssid,
 +#else
 			.channel = &wl->conf->channel,
 			.bssid = (u8 *)&wl->bssid,
 +#endif
 			.req_ie = conn_info->req_ie,
 			.req_ie_len = conn_info->req_ie_len,
 			.resp_ie = conn_info->resp_ie,
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0600-kernel-6.1-fix.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0600-kernel-6.1-fix.patch
@ -1,77 +0,0 @@
 --- a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c	2022-10-17 10:58:21.106425299 +0000
 +++ b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c	2022-10-18 10:26:53.683025167 +0000
@@ -108,17 +108,30 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
 static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy,
 -           struct net_device *dev, u8 key_idx, bool unicast, bool multicast);
 +           struct net_device *dev,
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
 +           int link_id,
 +#endif
 +           u8 key_idx, bool unicast, bool multicast);
 #else
 static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy,
            struct net_device *dev, u8 key_idx);
 #endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
 static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
 +           int link_id,
 +#endif
            u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params);
 static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
 +           int link_id,
 +#endif
            u8 key_idx, bool pairwise, const u8 *mac_addr);
 static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
 +           int link_id,
 +#endif
            u8 key_idx, bool pairwise, const u8 *mac_addr,
            void *cookie, void (*callback) (void *cookie, struct key_params *params));
 #else
@@ -1169,7 +1182,11 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
 static s32
 wl_cfg80211_config_default_key(struct wiphy *wiphy,
 -	struct net_device *dev, u8 key_idx, bool unicast, bool multicast)
 +	struct net_device *dev,
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
 +	int link_id,
 +#endif
 +	u8 key_idx, bool unicast, bool multicast)
 #else
 static s32
 wl_cfg80211_config_default_key(struct wiphy *wiphy,
@@ -1194,6 +1211,9 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
 static s32
 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
 +                    int link_id,
 +#endif
                     u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params)
 #else
 static s32
@@ -1315,6 +1335,9 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
 static s32
 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
 +                    int link_id,
 +#endif
                     u8 key_idx, bool pairwise, const u8 *mac_addr)
 #else
 static s32
@@ -1358,6 +1381,9 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
 static s32
 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
 +                    int link_id,
 +#endif
                     u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie,
                     void (*callback) (void *cookie, struct key_params * params))
 #else
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0600-kernel-6.12-fix.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0600-kernel-6.12-fix.patch
@ -1,11 +0,0 @@
 --- a/x86-64/src/wl/sys/wl_linux.c	2024-10-08 01:08:52.879388180 +0000
 +++ b/x86-64/src/wl/sys/wl_linux.c	2024-10-08 01:11:18.724103453 +0000
@@ -60,7 +60,7 @@
 #include <asm/irq.h>
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
 -#include <asm/unaligned.h>
 +#include <linux/unaligned.h>
 #include <proto/802.1d.h>
--- a/projects/Generic/options
+++ b/projects/Generic/options
@ -60,7 +60,7 @@
  # for a list of additional drivers see packages/linux-drivers
  # Space separated list is supported,
  # e.g. ADDITIONAL_DRIVERS+=" DRIVER1 DRIVER2"
-    ADDITIONAL_DRIVERS+=" bcm_sta"
+    ADDITIONAL_DRIVERS+=""
  # build and install driver addons (yes / no)
    DRIVER_ADDONS_SUPPORT="no"