c6ce65d3d0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
52 lines
1.3 KiB
Diff
52 lines
1.3 KiB
Diff
Reference: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=839629
|
|
|
|
--- a/src/wl/sys/wl_cfg80211_hybrid.c 2016-10-03 10:53:55.588036464 +0200
|
|
+++ b/src/wl/sys/wl_cfg80211_hybrid.c 2016-10-03 10:54:11.911695944 +0200
|
|
@@ -2386,8 +2386,15 @@
|
|
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, 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) {
|
|
- cfg80211_scan_done(wl->scan_request, true);
|
|
+#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;
|
|
}
|
|
|