6:03 p.m.
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30719
Modified Files:
wl-kmod.spec
Added Files:
wl-kmod-005_kernel_3.16.patch
Log Message:
* 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
wl-kmod-005_kernel_3.16.patch:
wl_cfg80211_hybrid.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
--- NEW FILE wl-kmod-005_kernel_3.16.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-07-15
21:28:47.002546122 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c 2014-09-10
19:27:13.301316520 +0200
@@ -63,8 +63,13 @@
static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_ibss_params *params);
static s32 wl_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)
+static s32 wl_cfg80211_get_station(struct wiphy *wiphy,
+ struct net_device *dev, const u8 *mac, struct station_info *sinfo);
+#else
static s32 wl_cfg80211_get_station(struct wiphy *wiphy,
struct net_device *dev, u8 *mac, struct station_info *sinfo);
+#endif
static s32 wl_cfg80211_set_power_mgmt(struct wiphy *wiphy,
struct net_device *dev, bool enabled, s32 timeout);
static int wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
@@ -1387,7 +1392,11 @@
key_endian_to_host(&key);
params.key_len = (u8) min_t(u8, DOT11_MAX_KEY_SIZE, key.len);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)
+ memcpy((void *)params.key, key.data, params.key_len);
+#else
memcpy(params.key, key.data, params.key_len);
+#endif
if ((err = wl_dev_ioctl(dev, WLC_GET_WSEC, &wsec, sizeof(wsec)))) {
return err;
@@ -1421,9 +1430,15 @@
return err;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)
+static s32
+wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
+ const u8 *mac, struct station_info *sinfo)
+#else
static s32
wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
u8 *mac, struct station_info *sinfo)
+#endif
{
struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
scb_val_t scb_val;
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-20/wl-kmod.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- wl-kmod.spec 9 Sep 2014 11:01:35 -0000 1.123
+++ wl-kmod.spec 10 Sep 2014 18:03:54 -0000 1.124
@@ -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: 1%{?dist}.9
+Release: 2%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,6 +19,7 @@
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
BuildRequires: %{_bindir}/kmodtool
@@ -61,6 +62,7 @@
%patch1 -p1 -b .wext_workaround.patch
%patch2 -p1 -b .kernel-3.8
%patch3 -p1 -b .kernel-3.15
+%patch4 -p1 -b .kernel-3.16
popd
for kernel_version in %{?kernel_versions} ; do
@@ -90,6 +92,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* 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