rpms/wl-kmod/devel wl-kmod-009_kernel_3.18_null_pointer.patch, NONE, 1.1 wl-kmod.spec, 1.95, 1.96

[Nicolas Viéville]

Author: nvieville

Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10488

Modified Files:
	wl-kmod.spec 
Added Files:
	wl-kmod-009_kernel_3.18_null_pointer.patch 
Log Message:
* Wed Feb 04 2015 Nicolas Viéville <nicolas.vieville at univ-valenciennes.fr> - 6.30.223.248-6
- Added patch to fix rfbz#3533 for kernel >= 3.18


wl-kmod-009_kernel_3.18_null_pointer.patch:
 wl_linux.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE wl-kmod-009_kernel_3.18_null_pointer.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_linux.c	2014-10-03 22:02:07.746840000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_linux.c	2015-02-04 10:27:39.501789047 +0100
@@ -2173,8 +2173,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.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- wl-kmod.spec	2 Feb 2015 19:38:03 -0000	1.95
+++ wl-kmod.spec	4 Feb 2015 15:39:17 -0000	1.96
@@ -3,11 +3,11 @@
 # "buildforkernels newest" macro for just that build; immediately after
 # queuing that build enable the macro again for subsequent builds; that way
 # a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
 
 Name:       wl-kmod
 Version:    6.30.223.248
-Release:    5%{?dist}.6
+Release:    6%{?dist}
 Summary:    Kernel module for Broadcom wireless devices
 Group:      System Environment/Kernel
 License:    Redistributable, no modification permitted
@@ -23,6 +23,7 @@
 Patch5:     wl-kmod-006_kernel_3.16.patch
 Patch6:     wl-kmod-007_kernel_3.17.patch
 Patch7:     wl-kmod-008_kernel_3.18.patch
+Patch8:     wl-kmod-009_kernel_3.18_null_pointer.patch
 
 BuildRequires:  %{_bindir}/kmodtool
 
@@ -69,6 +70,7 @@
 %patch5  -p1 -b .kernel-3.16
 %patch6  -p1 -b .kernel-3.17
 %patch7  -p1 -b .kernel-3.18
+%patch8  -p1 -b .kernel-3.18_null_pointer
 popd
 
 for kernel_version in %{?kernel_versions} ; do
@@ -98,6 +100,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Feb 04 2015 Nicolas Viéville <nicolas.vieville at univ-valenciennes.fr> - 6.30.223.248-6
+- Added patch to fix rfbz#3533 for kernel >= 3.18
+
 * Mon Feb 02 2015 Nicolas Chauvet <kwizart at gmail.com> - 6.30.223.248-5.6
 - Rebuilt for kernel