Author: nvieville Update of /cvs/nonfree/rpms/wl-kmod/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9666 Modified Files: wl-kmod.spec Added Files: wl-kmod-007_kernel_3.18.patch wl-kmod-008_kernel_3.18_null_pointer.patch Log Message: * Wed Feb 04 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 6.30.223.248-6 - Added patch to fix rfbz#3533 for kernel >= 3.18 - Added patch to build for kernel >= 3.18 wl-kmod-007_kernel_3.18.patch: wl_cfg80211_hybrid.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- NEW FILE wl-kmod-007_kernel_3.18.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-09-10 19:27:13.301316000 +0200 +++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c 2014-10-27 11:21:58.213536239 +0100 @@ -2025,9 +2025,17 @@ notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); notify_ielen = le32_to_cpu(bi->ie_length); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) + cbss = cfg80211_inform_bss(wiphy, channel, + (mgmt_type == IEEE80211_STYPE_PROBE_RESP) ? CFG80211_BSS_FTYPE_PRESP : CFG80211_BSS_FTYPE_BEACON, + (const u8 *)(bi->BSSID.octet), + 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, + (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); +#else cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet), 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); +#endif if (unlikely(!cbss)) return -ENOMEM; wl-kmod-008_kernel_3.18_null_pointer.patch: wl_linux.c | 5 +++++ 1 file changed, 5 insertions(+) --- NEW FILE wl-kmod-008_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/F-20/wl-kmod.spec,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- wl-kmod.spec 2 Feb 2015 20:02:42 -0000 1.141 +++ wl-kmod.spec 4 Feb 2015 14:11:19 -0000 1.142 @@ -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: 4%{?dist}.9 +Release: 5%{?dist} Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -21,6 +21,8 @@ Patch3: wl-kmod-004_kernel_3.15.patch Patch4: wl-kmod-005_kernel_3.16.patch Patch5: wl-kmod-006_kernel_3.17.patch +Patch6: wl-kmod-007_kernel_3.18.patch +Patch7: wl-kmod-008_kernel_3.18_null_pointer.patch BuildRequires: %{_bindir}/kmodtool @@ -65,6 +67,8 @@ %patch3 -p1 -b .kernel-3.15 %patch4 -p1 -b .kernel-3.16 %patch5 -p1 -b .kernel-3.17 +%patch6 -p1 -b .kernel-3.18 +%patch7 -p1 -b .kernel-3.18_null_pointer popd for kernel_version in %{?kernel_versions} ; do @@ -94,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 04 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 6.30.223.248-6 +- Added patch to fix rfbz#3533 for kernel >= 3.18 +- Added patch to build for kernel >= 3.18 + * Mon Feb 02 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-4.9 - Rebuilt for kernel