12:10 p.m.
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9296/F-20
Modified Files:
wl-kmod.spec
Added Files:
wl-kmod-005_gcc_4.9.patch wl-kmod-008_kernel_3.18.patch
wl-kmod-009_kernel_3.18_null_pointer.patch
Log Message:
Fix build for 3.18
wl-kmod-005_gcc_4.9.patch:
wl_linux.c | 5 +++++
1 file changed, 5 insertions(+)
--- NEW FILE wl-kmod-005_gcc_4.9.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-07-15
16:34:34.359230000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_linux.c 2014-07-15
17:27:12.550312091 +0200
@@ -2051,8 +2051,13 @@
void
wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b)
{
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9)
bcm_bprintf(b, "wl%d: %s %s version %s\n", wl->pub->unit,
__DATE__, __TIME__, EPI_VERSION_STR);
+#else
+ bcm_bprintf(b, "wl%d: version %s\n", wl->pub->unit,
+ EPI_VERSION_STR);
+#endif
}
#if defined(BCMDBG)
wl-kmod-008_kernel_3.18.patch:
wl_cfg80211_hybrid.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- NEW FILE wl-kmod-008_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-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/F-20/wl-kmod.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- wl-kmod.spec 8 Feb 2015 11:04:04 -0000 1.143
+++ wl-kmod.spec 8 Feb 2015 12:10:29 -0000 1.144
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 6.30.223.248
-Release: 5%{?dist}.1
+Release: 6%{?dist}.1
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,10 +19,11 @@
Patch1: wl-kmod-002_wext_workaround.patch
Patch2: wl-kmod-003_kernel_3.8.patch
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
+Patch4: wl-kmod-005_gcc_4.9.patch
+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
@@ -65,10 +66,11 @@
%patch1 -p1 -b .wext_workaround.patch
%patch2 -p1 -b .kernel-3.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
+%patch4 -p1 -b .gcc-4.9
+%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,197 +100,55 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Sun Feb 08 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-5.1
+* Sun Feb 08 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-6.1
- Rebuilt for kernel
* Wed Feb 04 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
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> - 6.30.223.248-4.9
-- Rebuilt for kernel
-
-* Sat Jan 10 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-4.8
-- Rebuilt for kernel
-
-* Wed Dec 24 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-4.7
-- Rebuilt for kernel
-* Thu Dec 18 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-4.6
+* Mon Feb 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-5.6
- Rebuilt for kernel
-* Sat Dec 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-4.5
+* Wed Jan 21 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-5.5
- Rebuilt for kernel
-* Sun Nov 23 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-4.4
+* Thu Jan 15 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-5.4
- Rebuilt for kernel
-* Sun Nov 16 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-4.3
+* Sat Jan 10 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-5.3
- Rebuilt for kernel
-* Mon Nov 10 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-4.2
+* Fri Dec 19 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-5.2
- Rebuilt for kernel
-* Fri Oct 31 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-4.1
+* Sun Dec 14 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-5.1
- Rebuilt for kernel
-* Wed Oct 29 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-4
-- Rebuild for akmod
-
-* Tue Oct 28 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-3.4
-- Rebuilt for kernel
-
-* Thu Oct 16 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-3.3
-- Rebuilt for kernel
-
-* Fri Oct 10 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-3.2
-- Rebuilt for kernel
+* Fri Dec 05 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-5
+- Rebuilt for f21 final kernel
-* Tue Oct 07 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-3.1
-- Rebuilt for kernel
+* Mon Oct 27 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.248-4
+- Added patch to build for kernel >= 3.18
* Fri Oct 03 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.248-3
- Added patch to build for kernel >= 3.17
-* Fri Sep 19 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-2.2
-- Rebuilt for kernel
-
-* Thu Sep 18 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-2.1
-- Rebuilt for kernel
-
* Wed Sep 10 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.248-2
- Added patch to build for kernel >= 3.16
-* Tue Sep 09 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-1.9
-- Rebuilt for kernel
-
-* Sat Aug 30 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-1.8
-- Rebuilt for kernel
-
-* Wed Aug 20 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-1.7
-- Rebuilt for kernel
-
-* Wed Aug 20 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-1.6
-- Rebuilt for kernel
-
-* Fri Aug 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-1.5
-- Rebuilt for kernel
-
-* Wed Aug 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-1.4
-- Rebuilt for kernel
-
-* Sat Aug 02 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-1.3
-- Rebuilt for kernel
-
-* Fri Aug 01 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-1.2
-- Rebuilt for kernel
-
-* Fri Jul 18 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-1.1
-- Rebuilt for kernel
-
-* Thu Jul 17 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.248-1
+* Tue Jul 15 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.248-1
- Upstream update to 6.30.223.248
- Patches cleaned-up and removed
-* Thu Jul 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-6.2
-- Rebuilt for kernel
-
-* Fri Jul 11 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.141-6.1
-- Rebuild for akmod
-
-* Tue Jul 08 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.141-6
+* Tue Jul 08 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.141-8
- Added late patch for __devinit since kernel 3.8
- Modified patch to build for kernel >= 3.15
-* Tue Jul 08 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 6.30.223.141-6
-- Patch for 3.15 kernel
-
-* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.29
-- Rebuilt for kernel
-
-* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.28
-- Rebuilt for kernel
-
-* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.27
-- Rebuilt for kernel
+* Thu May 08 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.141-7
+- Added patch to build with gcc >= 4.9 - fix error __TIME__ and __DATE__ macros
-* Tue Jun 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.26
-- Rebuilt for kernel
-
-* Fri Jun 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.25
-- Rebuilt for kernel
-
-* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.24
-- Rebuilt for kernel
-
-* Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.23
-- Rebuilt for kernel
-
-* Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.22
-- Rebuilt for kernel
-
-* Thu May 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.21
-- Rebuilt for kernel
-
-* Wed Apr 30 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.20
-- Rebuilt for kernel
-
-* Sat Apr 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.19
-- Rebuilt for kernel
-
-* Wed Apr 16 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.18
-- Rebuilt for kernel
-
-* Fri Apr 04 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.17
-- Rebuilt for kernel
-
-* Wed Apr 02 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.16
-- Rebuilt for kernel
-
-* Tue Mar 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.15
-- Rebuilt for kernel
-
-* Sun Mar 09 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.14
-- Rebuilt for kernel
-
-* Tue Mar 04 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.13
-- Rebuilt for kernel
-
-* Tue Feb 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.12
-- Rebuilt for kernel
-
-* Mon Feb 24 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.11
-- Rebuilt for kernel
-
-* Mon Feb 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.10
-- Rebuilt for kernel
-
-* Sat Feb 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.9
-- Rebuilt for kernel
-
-* Wed Feb 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.8
-- Rebuilt for kernel
-
-* Fri Feb 07 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.7
-- Rebuilt for kernel
-
-* Thu Jan 30 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.6
-- Rebuilt for kernel
-
-* Tue Jan 28 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.5
-- Rebuilt for kernel
-
-* Fri Jan 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.4
-- Rebuilt for kernel
-
-* Sun Jan 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.3
-- Rebuilt for kernel
-
-* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.2
-- Rebuilt for kernel
-
-* Fri Dec 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.1
-- Rebuilt for kernel
+* Tue Apr 22 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.141-6
+- Added patch to build for kernel >= 3.15
* Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5
- Rebuilt for f20 final kernel