mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2024-11-25 00:16:45 +00:00
97 lines
2.5 KiB
Diff
97 lines
2.5 KiB
Diff
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;
|
|
}
|
|
|