rpms/wl-kmod/devel broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch, NONE, 1.1 broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch, NONE, 1.1 wl-kmod.spec, 1.69, 1.70

[Nicolas Viéville]

Author: nvieville

Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20884

Modified Files:
	wl-kmod.spec 
Added Files:
	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 at univ-valenciennes.fr> - 5.100.82.112-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-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/devel/wl-kmod.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- wl-kmod.spec	17 Oct 2012 06:03:55 -0000	1.69
+++ wl-kmod.spec	20 Oct 2012 15:48:16 -0000	1.70
@@ -7,7 +7,7 @@
 
 Name:		wl-kmod
 Version:	5.100.82.112
-Release:	5%{?dist}.1
+Release:	6%{?dist}
 Summary:	Kernel module for Broadcom wireless devices
 Group:		System Environment/Kernel
 License:	Redistributable, no modification permitted
@@ -20,6 +20,8 @@
 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
 
@@ -60,6 +62,8 @@
 %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
@@ -89,6 +93,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sat Oct 20 2012 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.112-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
+
 * Wed Oct 17 2012 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.112-5.1
 - Cleaned up patch for kernel >= 3.6