2024-07-27 06:49:29 +00:00
|
|
|
From 8c536235639010135f8dc11a8ec0968f9b200a6e Mon Sep 17 00:00:00 2001
|
2020-04-24 23:36:52 +00:00
|
|
|
From: Alberto Milone <alberto.milone@canonical.com>
|
|
|
|
Date: Fri, 2 Sep 2016 17:35:34 +0200
|
2024-07-27 06:49:29 +00:00
|
|
|
Subject: [PATCH 05/16] linuxPackages.broadcom_sta: fix build for kernel 4.8+
|
2020-04-24 23:36:52 +00:00
|
|
|
|
2024-07-27 06:49:29 +00:00
|
|
|
Original author: Krzysztof Kolasa
|
|
|
|
|
|
|
|
Source: https://git.archlinux.org/svntogit/community.git/tree/trunk/004-linux48.patch?h=packages/broadcom-wl-dkms
|
2020-04-24 23:36:52 +00:00
|
|
|
---
|
|
|
|
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
|
2024-07-27 06:49:29 +00:00
|
|
|
index 3b438ba..84f0068 100644
|
2020-04-24 23:36:52 +00:00
|
|
|
--- a/src/wl/sys/wl_cfg80211_hybrid.c
|
|
|
|
+++ b/src/wl/sys/wl_cfg80211_hybrid.c
|
2024-07-27 06:49:29 +00:00
|
|
|
@@ -2386,8 +2386,16 @@ wl_bss_connect_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
|
2020-04-24 23:36:52 +00:00
|
|
|
s32 err = 0;
|
|
|
|
|
|
|
|
if (wl->scan_request) {
|
|
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
|
|
|
|
+ struct cfg80211_scan_info info = {
|
|
|
|
+ .aborted = true,
|
|
|
|
+ };
|
|
|
|
+ WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
|
|
|
|
+ cfg80211_scan_done(wl->scan_request, &info);
|
|
|
|
+#else
|
|
|
|
WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
|
|
|
|
cfg80211_scan_done(wl->scan_request, true);
|
|
|
|
+#endif
|
|
|
|
wl->scan_request = NULL;
|
|
|
|
}
|
|
|
|
|
2024-07-27 06:49:29 +00:00
|
|
|
@@ -2488,7 +2496,14 @@ wl_notify_scan_status(struct wl_cfg80211_priv *wl, struct net_device *ndev,
|
2020-04-24 23:36:52 +00:00
|
|
|
|
|
|
|
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();
|
2024-07-27 06:49:29 +00:00
|
|
|
@@ -2913,7 +2928,14 @@ s32 wl_cfg80211_down(struct net_device *ndev)
|
2020-04-24 23:36:52 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
--
|
2024-07-27 06:49:29 +00:00
|
|
|
2.45.1
|
2020-04-24 23:36:52 +00:00
|
|
|
|