rpms/wl-kmod/F-20 wl-kmod-005-2_devinit_late.patch, NONE, 1.1 wl-kmod-005_kernel_3.15.patch, 1.1, 1.2 wl-kmod.spec, 1.110, 1.111
Nicolas Viéville
nvieville at rpmfusion.org
Tue Jul 8 23:56:31 CEST 2014
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5526
Modified Files:
wl-kmod-005_kernel_3.15.patch wl-kmod.spec
Added Files:
wl-kmod-005-2_devinit_late.patch
Log Message:
Modified Files:
wl-kmod-005_kernel_3.15.patch wl-kmod.spec
Added Files:
wl-kmod-005-2_devinit_late.patch
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/F-20/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 8 Jul 2014 12:58:48 -0000 1.1
+++ wl-kmod-005_kernel_3.15.patch 8 Jul 2014 21:56:30 -0000 1.2
@@ -1,46 +1,28 @@
-From 05dd11abffe27c2fd8f618e79036be026f71b20c Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone at canonical.com>
-Date: Mon, 12 May 2014 17:32:44 +0200
-Subject: [PATCH 1/1] Add support for Linux 3.15
-
-Make sure to pass the channel to cfg80211_ibss_joined().
-
-This should fix LP: #1307744
----
- src/wl/sys/wl_cfg80211_hybrid.c | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
-index 3a5e46b..6384e58 100644
---- a/src/wl/sys/wl_cfg80211_hybrid.c
-+++ b/src/wl/sys/wl_cfg80211_hybrid.c
-@@ -1841,7 +1841,26 @@ wl_notify_connect_status(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+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-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)
-+ {
-+ struct wl_bss_info *bi;
-+ u16 bss_info_channel;
-+ struct ieee80211_channel *channel;
-+ u32 freq;
++ 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);
++ 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);
++ 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);
-+ }
++ 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
set_bit(WL_STATUS_CONNECTED, &wl->status);
wl->profile->active = true;
}
---
-1.9.1
-
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-20/wl-kmod.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- wl-kmod.spec 8 Jul 2014 12:58:49 -0000 1.110
+++ wl-kmod.spec 8 Jul 2014 21:56:30 -0000 1.111
@@ -19,7 +19,8 @@
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
+Patch4: wl-kmod-005-2_devinit_late.patch
+Patch5: wl-kmod-005_kernel_3.15.patch
BuildRequires: %{_bindir}/kmodtool
@@ -62,7 +63,8 @@
%patch1 -p1 -b .wext_workaround.patch
%patch2 -p1 -b .kernel-3.8
%patch3 -p1 -b .kernel-3.10
-%patch4 -p1 -b .kernel-3.15
+%patch4 -p1 -b .devinit_late
+%patch5 -p1 -b .kernel-3.15
popd
for kernel_version in %{?kernel_versions} ; do
@@ -92,6 +94,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jul 08 2014 Nicolas Viéville <nicolas.vieville at univ-valenciennes.fr> - 6.30.223.141-6
+- Added late patch for __devinit since kernel 3.8
+- Modified patch to build for kernel >= 3.15
+
* Tue Jul 08 2014 Leigh Scott <leigh123linux at googlemail.com> - 6.30.223.141-6
- Patch for 3.15 kernel
More information about the rpmfusion-commits
mailing list