rpms/wl-kmod/F-18 broadcom-wl-5.100.82.112-kernel-3.6.patch, NONE, 1.1 wl-kmod.spec, 1.65, 1.66
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31748
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-kernel-3.6.patch
Log Message:
* Tue Oct 16 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> -
5.100.82.112-5
- Added patch to build for kernel >= 3.6
broadcom-wl-5.100.82.112-kernel-3.6.patch:
wl_cfg80211.c | 10 ++++++++++
1 file changed, 10 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-kernel-3.6.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.c
hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.c 2011-10-22
18:56:55.000000000 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c 2012-10-16
14:30:42.882619819 +0200
@@ -42,7 +42,11 @@
enum nl80211_iftype type, u32 *flags, struct vif_params *params);
static s32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+static s32 wl_cfg80211_scan(struct wiphy *wiphy,
+#else
static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
+#endif
struct cfg80211_scan_request *request);
static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
@@ -570,10 +574,16 @@
}
static s32
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+wl_cfg80211_scan(struct wiphy *wiphy,
+#else
wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
+#endif
struct cfg80211_scan_request *request)
{
s32 err = 0;
+ struct wl_priv *wl = wiphy_to_wl(wiphy);
+ struct net_device *ndev = wl_to_ndev(wl);
CHECK_SYS_UP();
err = __wl_cfg80211_scan(wiphy, ndev, request, NULL);
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-18/wl-kmod.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- wl-kmod.spec 10 Oct 2012 17:13:23 -0000 1.65
+++ wl-kmod.spec 16 Oct 2012 18:56:29 -0000 1.66
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.100.82.112
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,6 +19,7 @@
Patch1: broadcom-wl-5.100.82.112-kernel-3.2.patch
Patch2: broadcom-wl-5.100.82.112-kernel-3.4.patch
Patch3: broadcom-wl-5.100.82.112-cfg80211.patch
+Patch4: broadcom-wl-5.100.82.112-kernel-3.6.patch
BuildRequires: %{_bindir}/kmodtool
@@ -58,6 +59,7 @@
%patch1 -p1 -b .kernel-3.2
%patch2 -p1 -b .kernel-3.4
%patch3 -p1 -b .cfg80211
+%patch4 -p1 -b .kernel-3.6
popd
for kernel_version in %{?kernel_versions} ; do
@@ -87,6 +89,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Oct 16 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> -
5.100.82.112-5
+- Added patch to build for kernel >= 3.6
+
* Wed Oct 10 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> -
5.100.82.112-4
- Added patch to build with CFG80211 API as default for F-17