rpms/wl-kmod/devel wl-kmod-009_kernel_4.0.patch, NONE, 1.1 wl-kmod.spec, 1.102, 1.103

[Nicolas Chauvet]

Author: kwizart

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

Modified Files:
	wl-kmod.spec 
Added Files:
	wl-kmod-009_kernel_4.0.patch 
Log Message:
Add patch for 4.0 kernel


wl-kmod-009_kernel_4.0.patch:
 wl_cfg80211_hybrid.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE wl-kmod-009_kernel_4.0.patch ---
--- a/src/wl/sys/wl_cfg80211_hybrid.c	2014-06-26 11:42:08.000000000 +0100
+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2015-03-02 12:37:17.128248174 +0000
@@ -1441,7 +1441,7 @@ wl_cfg80211_get_station(struct wiphy *wi
 		WL_DBG(("Could not get rate (%d)\n", err));
 	} else {
 		rate = dtoh32(rate);
-		sinfo->filled |= STATION_INFO_TX_BITRATE;
+		sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);
 		sinfo->txrate.legacy = rate * 5;
 		WL_DBG(("Rate %d Mbps\n", (rate / 2)));
 	}
@@ -1454,7 +1454,7 @@ wl_cfg80211_get_station(struct wiphy *wi
 			return err;
 		}
 		rssi = dtoh32(scb_val.val);
-		sinfo->filled |= STATION_INFO_SIGNAL;
+		sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
 		sinfo->signal = rssi;
 		WL_DBG(("RSSI %d dBm\n", rssi));
 	}


Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- wl-kmod.spec	23 Mar 2015 09:01:48 -0000	1.102
+++ wl-kmod.spec	23 Mar 2015 09:39:58 -0000	1.103
@@ -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 newest
 
 Name:       wl-kmod
 Version:    6.30.223.248
-Release:    6%{?dist}.6
+Release:    7%{?dist}
 Summary:    Kernel module for Broadcom wireless devices
 Group:      System Environment/Kernel
 License:    Redistributable, no modification permitted
@@ -24,6 +24,7 @@
 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
+Patch9:     wl-kmod-009_kernel_4.0.patch
 
 BuildRequires:  %{_bindir}/kmodtool
 
@@ -71,6 +72,7 @@
 %patch6  -p1 -b .kernel-3.17
 %patch7  -p1 -b .kernel-3.18
 %patch8  -p1 -b .kernel-3.18_null_pointer
+%patch9  -p1 -b .kernel-4.0
 popd
 
 for kernel_version in %{?kernel_versions} ; do
@@ -100,6 +102,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Mar 23 2015 Nicolas Chauvet <kwizart at gmail.com> - 6.30.223.248-7
+- Add patch for 4.0 kernel
+
 * Mon Mar 23 2015 Nicolas Chauvet <kwizart at gmail.com> - 6.30.223.248-6.6
 - Rebuilt for kernel