Author: nvieville Update of /cvs/nonfree/rpms/wl-kmod/F-16 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24338 Modified Files: wl-kmod.spec Added Files: broadcom-wl-5.100.82.112-cfg80211.patch broadcom-wl-5.100.82.112-kernel-3.6.patch broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch Log Message: * Sat Oct 20 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 5.100.82.112-4 - Added patch to build with CFG80211 API as default for F-16 - Added patch to build for kernel >= 3.6 - Added patch to include semaphore.h in wl_iw.h - Added patch from Archlinux to disable too many "ERROR @wl_cfg80211_get_station..." messages in /var/log/messages since activation of CFG80211 API broadcom-wl-5.100.82.112-cfg80211.patch: Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- NEW FILE broadcom-wl-5.100.82.112-cfg80211.patch --- diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/Makefile hybrid-portsrc_x86_32-v5_100_82_112/Makefile --- hybrid-portsrc_x86_32-v5_100_82_112.orig/Makefile 2011-10-22 18:56:55.000000000 +0200 +++ hybrid-portsrc_x86_32-v5_100_82_112/Makefile 2012-10-10 14:34:17.019295870 +0200 @@ -16,18 +16,18 @@ ifneq ($(KERNELRELEASE),) LINUXVER_GOODFOR_CFG80211:=$(strip $(shell \ - if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "32" ]; then \ - echo TRUE; \ - else \ + if [ "$(VERSION)" -le "2" -a "$(PATCHLEVEL)" -le "6" -a "$(SUBLEVEL)" -lt "32" ]; then \ echo FALSE; \ + else \ + echo TRUE; \ fi \ )) LINUXVER_WEXT_ONLY:=$(strip $(shell \ - if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "17" ]; then \ - echo FALSE; \ - else \ + if [ "$(VERSION)" -le "2" -a "$(PATCHLEVEL)" -le "6" -a "$(SUBLEVEL)" -lt "17" ]; then \ echo TRUE; \ + else \ + echo FALSE; \ fi \ )) broadcom-wl-5.100.82.112-kernel-3.6.patch: wl_cfg80211.c | 12 ++++++++++++ 1 file changed, 12 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 22:04:18.718673254 +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,18 @@ } 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; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) + struct wl_priv *wl = wiphy_to_wl(wiphy); + struct net_device *ndev = wl_to_ndev(wl); +#endif CHECK_SYS_UP(); err = __wl_cfg80211_scan(wiphy, ndev, request, NULL); broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch: wl_cfg80211.c | 5 ++++- wl_linux.c | 6 +----- 2 files changed, 5 insertions(+), 6 deletions(-) --- NEW FILE broadcom-wl-5.100.82.112-recent_kernel_ioctl.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 2012-10-16 22:04:18.718673254 +0200 +++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c 2012-10-20 16:16:20.071738204 +0200 @@ -1478,7 +1478,10 @@ scb_val.val = 0; err = wl_dev_ioctl(dev, WLC_GET_RSSI, &scb_val, sizeof(scb_val_t)); if (err) { - WL_ERR(("Could not get rssi (%d)\n", err)); + if (err != -EINVAL) { + // Don't fill syslog with EINVAL error + WL_ERR(("Could not get rssi (%d)\n", err)); + } return err; } rssi = dtoh32(scb_val.val); diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c --- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c 2012-10-16 14:26:28.087617125 +0200 +++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c 2012-10-20 16:16:20.447738352 +0200 @@ -1587,11 +1587,7 @@ } WL_LOCK(wl); - if (!capable(CAP_NET_ADMIN)) { - bcmerror = BCME_EPERM; - } else { - bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif); - } + bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif); WL_UNLOCK(wl); done1: broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch: wl_iw.h | 1 + 1 file changed, 1 insertion(+) --- NEW FILE broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch --- diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_iw.h hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_iw.h --- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_iw.h 2011-10-22 18:56:55.000000000 +0200 +++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_iw.h 2012-10-20 16:16:20.396738313 +0200 @@ -15,6 +15,7 @@ #ifndef _wl_iw_h_ #define _wl_iw_h_ +#include <linux/semaphore.h> #include <linux/wireless.h> #include <typedefs.h> Index: wl-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/F-16/wl-kmod.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- wl-kmod.spec 18 Oct 2012 18:44:29 -0000 1.107 +++ wl-kmod.spec 20 Oct 2012 17:22:06 -0000 1.108 @@ -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 -%define buildforkernels newest +%define buildforkernels current Name: wl-kmod Version: 5.100.82.112 -Release: 3%{?dist}.14 +Release: 4%{?dist} Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -18,6 +18,10 @@ Patch0: broadcom-wl-5.100.82.112-license.patch 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 +Patch5: broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch +Patch6: broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch BuildRequires: %{_bindir}/kmodtool @@ -56,6 +60,10 @@ %patch0 -p1 -b .license %patch1 -p1 -b .kernel-3.2 %patch2 -p1 -b .kernel-3.4 +%patch3 -p1 -b .cfg80211 +%patch4 -p1 -b .kernel-3.6 +%patch5 -p1 -b .recent_kernel_semaphore +%patch6 -p1 -b .recent_kernel_ioctl popd for kernel_version in %{?kernel_versions} ; do @@ -85,6 +93,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Oct 20 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 5.100.82.112-4 +- Added patch to build with CFG80211 API as default for F-16 +- Added patch to build for kernel >= 3.6 +- Added patch to include semaphore.h in wl_iw.h +- Added patch from Archlinux to disable too many "ERROR @wl_cfg80211_get_station..." messages + in /var/log/messages since activation of CFG80211 API + * Thu Oct 18 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 5.100.82.112-3.14 - Rebuilt for updated kernel