7:47 p.m.
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29087
Modified Files:
wl-kmod-005_kernel_3.15.patch wl-kmod.spec
Added Files:
wl-kmod-005-2_devinit_late.patch
Log Message:
* 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
wl-kmod-005-2_devinit_late.patch:
linuxver.h | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE wl-kmod-005-2_devinit_late.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/include/linuxver.h
hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/include/linuxver.h
--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/include/linuxver.h 2013-08-01
08:52:22.000000000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/include/linuxver.h 2014-07-02
18:36:28.616225432 +0200
@@ -169,8 +169,12 @@
#define __devexit
#endif
#ifndef __devinit
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
+#define __devinit
+#else
#define __devinit __init
#endif
+#endif
#ifndef __devinitdata
#define __devinitdata
#endif
wl-kmod-005_kernel_3.15.patch:
wl_cfg80211_hybrid.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
Index: wl-kmod-005_kernel_3.15.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod-005_kernel_3.15.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wl-kmod-005_kernel_3.15.patch 22 Apr 2014 16:58:46 -0000 1.1
+++ wl-kmod-005_kernel_3.15.patch 8 Jul 2014 19:47:54 -0000 1.2
@@ -1,12 +1,25 @@
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_cfg80211_hybrid.c
hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_cfg80211_hybrid.c
---
hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_cfg80211_hybrid.c 2013-08-01
08:52:22.000000000 +0200
-+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_cfg80211_hybrid.c 2014-04-22
17:41:44.507896038 +0200
-@@ -1841,7 +1841,11 @@
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_cfg80211_hybrid.c 2014-07-02
19:31:07.052144739 +0200
+@@ -1841,7 +1841,24 @@
wl_get_assoc_ies(wl);
memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
wl_update_bss_info(wl);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
-+ cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, &wl->conf->channel,
GFP_KERNEL);
++ struct wl_bss_info *bi;
++ u16 bss_info_channel;
++ struct ieee80211_channel *channel;
++ u32 freq;
++
++ bi = (struct wl_bss_info *)(wl->extra_buf + 4);
++ bss_info_channel = bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(bi->chanspec);
++
++ freq = ieee80211_channel_to_frequency(bss_info_channel,
++ (bss_info_channel <= CH_MAX_2G_CHANNEL) ?
++ IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
++
++ channel = ieee80211_get_channel(wl_to_wiphy(wl), freq);
++ cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
+#else
cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
+#endif
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- wl-kmod.spec 8 May 2014 10:36:22 -0000 1.83
+++ wl-kmod.spec 8 Jul 2014 19:47:54 -0000 1.84
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 6.30.223.141
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,8 +19,9 @@
Patch1: wl-kmod-002_wext_workaround.patch
Patch2: wl-kmod-003_kernel_3.8.patch
Patch3: wl-kmod-004_kernel_3.10.patch
-Patch4: wl-kmod-005_kernel_3.15.patch
-Patch5: wl-kmod-006_gcc_4.9.patch
+Patch4: wl-kmod-005-2_devinit_late.patch
+Patch5: wl-kmod-005_kernel_3.15.patch
+Patch6: wl-kmod-006_gcc_4.9.patch
BuildRequires: %{_bindir}/kmodtool
@@ -63,8 +64,9 @@
%patch1 -p1 -b .wext_workaround.patch
%patch2 -p1 -b .kernel-3.8
%patch3 -p1 -b .kernel-3.10
-%patch4 -p1 -b .kernel-3.15
-%patch5 -p1 -b .gcc-4.9
+%patch4 -p1 -b .devinit_late
+%patch5 -p1 -b .kernel-3.15
+%patch6 -p1 -b .gcc-4.9
popd
for kernel_version in %{?kernel_versions} ; do
@@ -94,6 +96,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* 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
+
* 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