Author: nvieville Update of /cvs/nonfree/rpms/wl-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14889 Modified Files: wl-kmod.spec Added Files: wl-kmod-002_kernel_3.18_null_pointer.patch Log Message: * Sat Oct 17 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 6.30.223.271-2 - Re-add patch for kernel >= 3.18 wl-kmod-002_kernel_3.18_null_pointer.patch: wl_linux.c | 5 +++++ 1 file changed, 5 insertions(+) --- NEW FILE wl-kmod-002_kernel_3.18_null_pointer.patch --- diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c --- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c 2015-09-19 00:47:30.000000000 +0200 +++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c 2015-10-17 18:26:48.174207806 +0200 @@ -2165,8 +2165,13 @@ wlif = WL_DEV_IF(dev); wl = WL_INFO(dev); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) + skb->prev = NULL; +#endif if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) skb->prev = NULL; +#endif TXQ_LOCK(wl); Index: wl-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- wl-kmod.spec 14 Oct 2015 18:50:16 -0000 1.133 +++ wl-kmod.spec 18 Oct 2015 00:31:54 -0000 1.134 @@ -7,7 +7,7 @@ Name: wl-kmod Version: 6.30.223.271 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -16,6 +16,7 @@ Source1: https://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_... Source11: wl-kmod-kmodtool-excludekernel-filterfile Patch0: wl-kmod-001_wext_workaround.patch +Patch1: wl-kmod-002_kernel_3.18_null_pointer.patch BuildRequires: %{_bindir}/kmodtool @@ -55,6 +56,7 @@ tar xzf %{SOURCE1} %endif %patch0 -p1 -b .wext_workaround.patch +%patch1 -p1 -b .kernel_3.18_null_pointer.patch popd for kernel_version in %{?kernel_versions} ; do @@ -84,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Oct 17 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 6.30.223.271-2 +- Re-add patch for kernel >= 3.18 + * Wed Oct 14 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 6.30.223.271-1 - Upstream update to 6.30.223.271 - Patches cleaned-up and removed