Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5c975171010dafae143b4a0d1a2fe8578635eb44
commit 5c975171010dafae143b4a0d1a2fe8578635eb44 Author: DeX77 <[email protected]> Date: Sat Oct 8 18:46:31 2016 +0200 bcmwl-6.30.223.271-19-x86_64 * fix for kernel NULL pointer dereference at cfg80211_scan_done with kernel 4.8.0 thx Debian diff --git a/source/network-extra/bcmwl/FrugalBuild b/source/network-extra/bcmwl/FrugalBuild index 06c1e72..9528ae3 100644 --- a/source/network-extra/bcmwl/FrugalBuild +++ b/source/network-extra/bcmwl/FrugalBuild @@ -3,7 +3,7 @@ pkgname=bcmwl pkgver=6.30.223.271 -pkgrel=18 +pkgrel=19 pkgdesc="Broadcom 802.11 Linux STA wireless driver" url="http://www.broadcom.com/support/802.11/linux_sta.php"; Finclude kernel-module @@ -13,11 +13,15 @@ Fpkgversep="" up2date="lynx -dump http://www.broadcom.com/support/802.11| grep -a README_|sed 's/.*README_\(.*\).txt/\1/'" _F_cd_path="." source=(http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz \ - $pkgname.conf null-poiter-crash.patch linux-4.7.patch) + $pkgname.conf \ + null-poiter-crash.patch \ + linux-4.7.patch \ + linux-4.8.patch ) sha1sums=('1f568bb989d175813c5631c6629d9479eae6f3be' \ 'a37c5dd9ab279372f0c68595bb2a8f1fe694cd13' \ 'b400d4eb8a531c7329a28f2be4ce3b4bd37e1d56' \ - '95243e5fcd9b32459c9a945f1b0ac217dab1755a') + '95243e5fcd9b32459c9a945f1b0ac217dab1755a' \ + 'c0447fa30afc7091261fa5aa497135815ef2e70d') build() { diff --git a/source/network-extra/bcmwl/linux-4.8.patch b/source/network-extra/bcmwl/linux-4.8.patch new file mode 100644 index 0000000..2924338 --- /dev/null +++ b/source/network-extra/bcmwl/linux-4.8.patch @@ -0,0 +1,61 @@ + +Package: broadcom-sta-source +Version: 6.30.223.271-3 + +Looking at the patch for kernel 4.8, I came up with the attached patch +(and I send this mail while running it :) + +Thanks, +Koos Vriezen + + +--- src/wl/sys/wl_cfg80211_hybrid.c.orig 2016-10-03 10:53:55.588036464 +0200 ++++ 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; + } + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
