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

[Nicolas Viéville]

Author: nvieville

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

Modified Files:
	wl-kmod.spec 
Added Files:
	wl-kmod-010_kernel_4.0.patch 
Removed Files:
	wl-kmod-009_kernel_4.0.patch 
Log Message:
* Wed Mar 25 2015 Nicolas Viéville <nicolas.vieville at univ-valenciennes.fr> - 6.30.223.248-7.1
- Modified patch for kernel >= 4.0 to allow build for kernel < 4.0


wl-kmod-010_kernel_4.0.patch:
 wl_cfg80211_hybrid.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE wl-kmod-010_kernel_4.0.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_cfg80211_hybrid.c	2014-10-27 11:21:58.213536000 +0100
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c	2015-03-23 19:46:18.826690045 +0100
@@ -1456,7 +1456,11 @@
 		WL_DBG(("Could not get rate (%d)\n", err));
 	} else {
 		rate = dtoh32(rate);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
+		sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);
+#else
 		sinfo->filled |= STATION_INFO_TX_BITRATE;
+#endif
 		sinfo->txrate.legacy = rate * 5;
 		WL_DBG(("Rate %d Mbps\n", (rate / 2)));
 	}
@@ -1469,7 +1473,11 @@
 			return err;
 		}
 		rssi = dtoh32(scb_val.val);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
+		sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
+#else
 		sinfo->filled |= STATION_INFO_SIGNAL;
+#endif
 		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.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- wl-kmod.spec	23 Mar 2015 09:39:58 -0000	1.103
+++ wl-kmod.spec	25 Mar 2015 19:00:57 -0000	1.104
@@ -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 akmod
 
 Name:       wl-kmod
 Version:    6.30.223.248
-Release:    7%{?dist}
+Release:    7.1%{?dist}
 Summary:    Kernel module for Broadcom wireless devices
 Group:      System Environment/Kernel
 License:    Redistributable, no modification permitted
@@ -24,7 +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
+Patch9:     wl-kmod-010_kernel_4.0.patch
 
 BuildRequires:  %{_bindir}/kmodtool
 
@@ -102,6 +102,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Mar 25 2015 Nicolas Viéville <nicolas.vieville at univ-valenciennes.fr> - 6.30.223.248-7.1
+- Modified patch for kernel >= 4.0 to allow build for kernel < 4.0
+
 * Mon Mar 23 2015 Nicolas Chauvet <kwizart at gmail.com> - 6.30.223.248-7
 - Add patch for 4.0 kernel
 


--- wl-kmod-009_kernel_4.0.patch DELETED ---