Author: kwizart Update of /cvs/nonfree/rpms/wl-kmod/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26630/F-20 Modified Files: wl-kmod.spec Added Files: wl-kmod-010_kernel_4.0.patch Log Message: Fix for 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/F-20/wl-kmod.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- wl-kmod.spec 2 Jun 2015 08:01:39 -0000 1.157 +++ wl-kmod.spec 2 Jun 2015 09:51:14 -0000 1.158 @@ -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: 7%{?dist}.2 +Release: 8%{?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-010_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,31 +102,43 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Jun 02 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-7.2 +* Wed May 20 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 6.30.223.248-8 +- Update new Broadcom upstream URLs in SPEC file + +* Wed May 20 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-7.10 - Rebuilt for kernel -* Sun May 24 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-7.1 +* Wed May 13 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-7.9 - Rebuilt for kernel -* Wed May 20 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 6.30.223.248-7 -- Update new Broadcom upstream URLs in SPEC file +* Sat May 09 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-7.8 +- Rebuilt for kernel -* Wed May 13 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-6.10 +* Sat May 02 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-7.7 - Rebuilt for kernel -* Sat May 09 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-6.9 +* Wed Apr 22 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-7.6 - Rebuilt for kernel -* Sat May 02 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-6.8 +* Wed Apr 15 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-7.5 - Rebuilt for kernel -* Wed Apr 22 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-6.7 +* Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-7.4 - Rebuilt for kernel -* Wed Apr 15 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-6.6 +* Wed Mar 25 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-7.2 +- Rebuilt for current + +* Wed Mar 25 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 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(a)gmail.com&gt; - 6.30.223.248-7 +- Add patch for 4.0 kernel + +* Mon Mar 23 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-6.6 - Rebuilt for kernel -* Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-6.5 +* Sat Mar 21 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-6.5 - Rebuilt for kernel * Tue Mar 10 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-6.4