diff --git a/kernel/drivers/module-broadcom-wl/files/conf/broadcom-wl-blacklist.conf b/kernel/drivers/module-broadcom-wl/files/conf/broadcom-wl-blacklist.conf index 258f4f4d..f09d4c17 100644 --- a/kernel/drivers/module-broadcom-wl/files/conf/broadcom-wl-blacklist.conf +++ b/kernel/drivers/module-broadcom-wl/files/conf/broadcom-wl-blacklist.conf @@ -1,6 +1,5 @@ -blacklist brcm80211 blacklist b43 blacklist ssb blacklist bcma blacklist brcmsmac -blacklist brcmfmac \ No newline at end of file +blacklist brcmfmac diff --git a/kernel/drivers/module-broadcom-wl/files/patch/linux48.patch b/kernel/drivers/module-broadcom-wl/files/patch/linux48.patch new file mode 100644 index 00000000..0f3e8190 --- /dev/null +++ b/kernel/drivers/module-broadcom-wl/files/patch/linux48.patch @@ -0,0 +1,52 @@ +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; + } + diff --git a/kernel/drivers/module-broadcom-wl/pspec.xml b/kernel/drivers/module-broadcom-wl/pspec.xml index d1e783d5..da395827 100644 --- a/kernel/drivers/module-broadcom-wl/pspec.xml +++ b/kernel/drivers/module-broadcom-wl/pspec.xml @@ -12,8 +12,8 @@ driver Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver for use with Broadcom's BCM4311, BCM4312, BCM4321, and BCM4322 based hardware This package contains Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver for use with Broadcom's BCM4311, BCM4312, BCM4321, and BCM4322 based hardware. You must read the LICENSE.txt file in the docs directory before using this software. - http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz - http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz + https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz + https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz kernel-module-headers @@ -21,6 +21,7 @@ patch/license.patch patch/wl_linux.c.patch patch/linux47.patch + patch/linux48.patch @@ -56,6 +57,13 @@ + + 2017-01-08 + 6.30.223.271 + Fix url and add patch. + PisiLinux Community + admin@pisilinux.org + 2016-12-10 6.30.223.271