rpms/xtables-addons-kmod/F-17 xtables-addons-kmod.spec,1.58,1.59
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xtables-addons-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30185
Modified Files:
xtables-addons-kmod.spec
Log Message:
* Wed Nov 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.46-1.8
- Rebuilt for updated kernel
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-17/xtables-addons-kmod.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- xtables-addons-kmod.spec 20 Nov 2012 00:28:58 -0000 1.58
+++ xtables-addons-kmod.spec 21 Nov 2012 14:47:48 -0000 1.59
@@ -8,7 +8,7 @@
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
Version: 1.46
-Release: 1%{?dist}.7
+Release: 1%{?dist}.8
License: GPLv2
Group: System Environment/Kernel
URL: http://xtables-addons.sourceforge.net
@@ -66,6 +66,9 @@
rm -rf %{buildroot}
%changelog
+* Wed Nov 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.46-1.8
+- Rebuilt for updated kernel
+
* Tue Nov 20 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.46-1.7
- Rebuilt for updated kernel
11 years, 10 months
rpms/west-chamber-kmod/F-17 west-chamber-kmod.spec,1.47,1.48
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/west-chamber-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30058
Modified Files:
west-chamber-kmod.spec
Log Message:
* Wed Nov 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn.39
- Rebuilt for updated kernel
Index: west-chamber-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/F-17/west-chamber-kmod.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- west-chamber-kmod.spec 20 Nov 2012 00:28:45 -0000 1.47
+++ west-chamber-kmod.spec 21 Nov 2012 14:47:39 -0000 1.48
@@ -11,7 +11,7 @@
Name: west-chamber-kmod
Summary: Kernel module (kmod) for west-chamber
Version: 0.0.1
-Release: 7.%{?svndate}svn%{?dist}.38
+Release: 7.%{?svndate}svn%{?dist}.39
License: GPLv2+
Group: System Environment/Kernel
URL: http://code.google.com/p/scholarzhang/
@@ -82,6 +82,9 @@
rm -rf %{buildroot}
%changelog
+* Wed Nov 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn.39
+- Rebuilt for updated kernel
+
* Tue Nov 20 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn.38
- Rebuilt for updated kernel
11 years, 10 months
rpms/VirtualBox-kmod/F-17 VirtualBox-kmod.spec,1.34,1.35
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/VirtualBox-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29930
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Wed Nov 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.4-3.2
- Rebuilt for updated kernel
11 years, 10 months
rpms/staging-kmod/F-17 staging-kmod.spec,1.63,1.64
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/staging-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29805
Modified Files:
staging-kmod.spec
Log Message:
* Wed Nov 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.6.1-1.7
- Rebuilt for updated kernel
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-17/staging-kmod.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- staging-kmod.spec 20 Nov 2012 00:28:21 -0000 1.63
+++ staging-kmod.spec 21 Nov 2012 14:47:16 -0000 1.64
@@ -20,7 +20,7 @@
Name: staging-kmod
Version: 3.6.1
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.6
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.7
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -136,6 +136,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Nov 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.6.1-1.7
+- Rebuilt for updated kernel
+
* Tue Nov 20 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.6.1-1.6
- Rebuilt for updated kernel
11 years, 10 months
rpms/openafs-kmod/F-17 openafs-kmod.spec,1.55,1.56
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/openafs-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29681
Modified Files:
openafs-kmod.spec
Log Message:
* Wed Nov 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.6
- Rebuilt for updated kernel
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-17/openafs-kmod.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- openafs-kmod.spec 20 Nov 2012 00:28:05 -0000 1.55
+++ openafs-kmod.spec 21 Nov 2012 14:47:06 -0000 1.56
@@ -21,7 +21,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.1
-Release: 4%{?dist}.5
+Release: 4%{?dist}.6
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -147,6 +147,9 @@
%changelog
+* Wed Nov 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.6
+- Rebuilt for updated kernel
+
* Tue Nov 20 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.5
- Rebuilt for updated kernel
11 years, 10 months
rpms/ndiswrapper-kmod/F-17 ndiswrapper-kmod.spec,1.91,1.92
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ndiswrapper-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29551
Modified Files:
ndiswrapper-kmod.spec
Log Message:
* Wed Nov 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-2.36
- Rebuilt for updated kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-17/ndiswrapper-kmod.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ndiswrapper-kmod.spec 20 Nov 2012 00:27:54 -0000 1.91
+++ ndiswrapper-kmod.spec 21 Nov 2012 14:46:56 -0000 1.92
@@ -10,7 +10,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.57
-Release: 2%{?dist}.35
+Release: 2%{?dist}.36
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -77,6 +77,9 @@
%changelog
+* Wed Nov 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-2.36
+- Rebuilt for updated kernel
+
* Tue Nov 20 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-2.35
- Rebuilt for updated kernel
11 years, 10 months
rpms/wl-kmod/F-18 broadcom-wl-5.100.82.112-wext_workaround.patch, NONE, 1.1 broadcom-wl-5.100.82.112-kernel-3.2.patch, 1.1, 1.2 broadcom-wl-5.100.82.112-kernel-3.6.patch, 1.2, 1.3 broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch, 1.1, 1.2 broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch, 1.1, 1.2 wl-kmod.spec, 1.68, 1.69
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23998
Modified Files:
broadcom-wl-5.100.82.112-kernel-3.2.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
wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-wext_workaround.patch
Log Message:
* Wed Nov 21 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-7
- Added patch to choose API at build time (WEXT or CFG80211) to workaround #2548 #2562
- Others patches cleaned-up
broadcom-wl-5.100.82.112-wext_workaround.patch:
Makefile | 14 ++++++++++++++
1 file changed, 14 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-wext_workaround.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 2012-10-10 14:34:17.000000000 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/Makefile 2012-11-09 14:25:09.755455777 +0100
@@ -13,6 +13,8 @@
#
# $Id: Makefile_kbuild_portsrc,v 1.6.54.4 2011-01-27 00:55:34 Exp $
+API_ETC_FILE := /etc/akmods/akmod-wl/api
+
ifneq ($(KERNELRELEASE),)
LINUXVER_GOODFOR_CFG80211:=$(strip $(shell \
@@ -31,6 +33,18 @@
fi \
))
+ API_FILE:=$(strip $(shell \
+ if [ -r "$(API_ETC_FILE)" ]; then \
+ echo TRUE; \
+ else \
+ echo FALSE; \
+ fi \
+ ))
+
+ ifeq ($(API_FILE), TRUE)
+ include $(API_ETC_FILE)
+ endif
+
ifneq ($(API),)
ifeq ($(API), CFG80211)
APICHOICE := FORCE_CFG80211
broadcom-wl-5.100.82.112-kernel-3.2.patch:
wl_linux.c | 4 ++++
1 file changed, 4 insertions(+)
Index: broadcom-wl-5.100.82.112-kernel-3.2.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-18/broadcom-wl-5.100.82.112-kernel-3.2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- broadcom-wl-5.100.82.112-kernel-3.2.patch 9 Jan 2012 21:36:14 -0000 1.1
+++ broadcom-wl-5.100.82.112-kernel-3.2.patch 21 Nov 2012 12:30:30 -0000 1.2
@@ -5,7 +5,7 @@
#endif
.ndo_get_stats = wl_get_stats,
.ndo_set_mac_address = wl_set_mac_address,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 42) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0))
+ .ndo_set_rx_mode = wl_set_multicast_list,
+#else
.ndo_set_multicast_list = wl_set_multicast_list,
broadcom-wl-5.100.82.112-kernel-3.6.patch:
wl_cfg80211.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
Index: broadcom-wl-5.100.82.112-kernel-3.6.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-18/broadcom-wl-5.100.82.112-kernel-3.6.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- broadcom-wl-5.100.82.112-kernel-3.6.patch 17 Oct 2012 06:02:35 -0000 1.2
+++ broadcom-wl-5.100.82.112-kernel-3.6.patch 21 Nov 2012 12:30:30 -0000 1.3
@@ -1,33 +1,32 @@
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 @@
++++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c 2012-11-07 17:34:38.141769328 +0100
+@@ -42,7 +42,10 @@
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, struct net_device *ndev,
+static s32 wl_cfg80211_scan(struct wiphy *wiphy,
-+#else
- static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
++ 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 @@
+@@ -570,10 +573,16 @@
}
static s32
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+-wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
+wl_cfg80211_scan(struct wiphy *wiphy,
-+#else
- wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
++ 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);
++ struct net_device *ndev = request->wdev->netdev;
+#endif
CHECK_SYS_UP();
broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch:
wl_cfg80211.c | 14 ++++++++------
wl_linux.c | 6 +-----
2 files changed, 9 insertions(+), 11 deletions(-)
Index: broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-18/broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch 20 Oct 2012 15:57:00 -0000 1.1
+++ broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch 21 Nov 2012 12:30:30 -0000 1.2
@@ -1,21 +1,31 @@
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 @@
+--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.c 2012-11-07 17:34:38.141769328 +0100
++++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c 2012-11-07 18:16:51.342521040 +0100
+@@ -1475,13 +1475,15 @@
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) {
+- return err;
++ if (err != -EINVAL)
+ // Don't fill syslog with EINVAL error
+ WL_ERR(("Could not get rssi (%d)\n", err));
-+ }
- return err;
++ } else {
++ rssi = dtoh32(scb_val.val);
++ sinfo->filled |= STATION_INFO_SIGNAL;
++ sinfo->signal = rssi;
++ WL_DBG(("RSSI %d dBm\n", rssi));
}
- rssi = dtoh32(scb_val.val);
+- rssi = dtoh32(scb_val.val);
+- sinfo->filled |= STATION_INFO_SIGNAL;
+- sinfo->signal = rssi;
+- WL_DBG(("RSSI %d dBm\n", rssi));
+ }
+
+ return err;
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
+--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c 2012-11-07 17:52:29.434087011 +0100
++++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c 2012-11-07 17:59:01.626202471 +0100
@@ -1587,11 +1587,7 @@
}
broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch:
wl_cfg80211.h | 2 ++
wl_iw.h | 1 +
wl_linux.h | 2 ++
3 files changed, 5 insertions(+)
Index: broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-18/broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch 20 Oct 2012 15:57:00 -0000 1.1
+++ broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch 21 Nov 2012 12:30:30 -0000 1.2
@@ -1,3 +1,15 @@
+diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.h hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.h
+--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.h 2011-10-22 18:56:55.000000000 +0200
++++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.h 2012-11-07 18:04:55.286309234 +0100
+@@ -16,6 +16,8 @@
+ #ifndef _wl_cfg80211_h_
+ #define _wl_cfg80211_h_
+
++#include <linux/semaphore.h>
++
+ #include <net/cfg80211.h>
+ #include <wlioctl.h>
+
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
@@ -9,3 +21,15 @@
#include <linux/wireless.h>
#include <typedefs.h>
+diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.h hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.h
+--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.h 2011-10-22 18:56:55.000000000 +0200
++++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.h 2012-11-07 18:04:55.394309261 +0100
+@@ -15,6 +15,8 @@
+ #ifndef _wl_linux_h_
+ #define _wl_linux_h_
+
++#include <linux/semaphore.h>
++
+ #include <wlc_types.h>
+
+ typedef struct wl_timer {
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-18/wl-kmod.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- wl-kmod.spec 20 Oct 2012 15:57:00 -0000 1.68
+++ wl-kmod.spec 21 Nov 2012 12:30:30 -0000 1.69
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.100.82.112
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -22,6 +22,7 @@
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
+Patch7: broadcom-wl-5.100.82.112-wext_workaround.patch
BuildRequires: %{_bindir}/kmodtool
@@ -40,7 +41,9 @@
BCM4322-, BCM43224-, and BCM43225-, BCM43227- and BCM43228-based hardware.
NOTE: You must read the LICENSE.txt file in the docs directory before using
-this software.
+this software. You should read the fedora.readme file in the docs directory
+in order to know how to configure this software if you encounter problems
+while boot sequence or with the CFG80211 API (revert to the WEXT API).
%prep
# error out if there was something wrong with kmodtool
@@ -64,6 +67,7 @@
%patch4 -p1 -b .kernel-3.6
%patch5 -p1 -b .recent_kernel_semaphore
%patch6 -p1 -b .recent_kernel_ioctl
+%patch7 -p1 -b .wext_workaround.patch
popd
for kernel_version in %{?kernel_versions} ; do
@@ -93,6 +97,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Nov 21 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-7
+- Added patch to choose API at build time (WEXT or CFG80211) to workaround #2548 #2562
+- Others patches cleaned-up
+
* Sat Oct 20 2012 Nicolas Vieville <nicolas.vieville(a)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
11 years, 10 months
rpms/broadcom-wl/F-18 20-wl.conf, NONE, 1.1 api, NONE, 1.1 fedora.readme, NONE, 1.1 broadcom-wl.spec, 1.18, 1.19
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/broadcom-wl/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23768
Modified Files:
broadcom-wl.spec
Added Files:
20-wl.conf api fedora.readme
Log Message:
* Wed Nov 21 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3
- Added /etc/dracut.conf.d/20-wl.conf to workaround #2526
- Added /etc/akmods/akmod-wl/api to workaround #2548 #2562
- fedora.readme added to explain usage of the above
--- NEW FILE 20-wl.conf ---
## /etc/dracut.conf.d/20-wl.conf file
##
## Explanation:
##
## Use only with Broadcom STA wireless driver provided by RPMFusion
## broadcom-wl, akmod-wl and kmod-wl packages.
## Provides required modules in order to avoid kernel 3.6.X panic at
## boot time on certain platforms such as HP Pavilion dm1 Notebook PC.
## See https://bugzilla.rpmfusion.org/show_bug.cgi?id=2526#c29 for an
## example of possible issues.
## To be able to boot the failing kernel, one should add wl.disable=1
## to the grub boot command.
##
## Usage:
##
## - Uncomment the line beginning with "add_drivers+=" below to add the
## required module to your current and future kernels. Then Rebuild
## the current kernel initramfs file by typing "dracut" in a root
## console.
##
## - Comment the line beginning with "add_drivers+=" below to remove the
## required module of your current and future kernels. Then Rebuild
## the current kernel initramfs file by typing "dracut" in a root
## console.
##
## Caution:
##
## Consider to rebuild your initramfs file every time it is needed.
##
## See http://people.redhat.com/harald/dracut.html#id489921 and
## http://people.redhat.com/harald/dracut.html#dracutconf5 for
## complete explanations on using dracut.
##
## State:
##
## Disabled by default
##
#add_drivers+="lib80211 lib80211_crypt_tkip wl"
--- NEW FILE api ---
#API=WEXT
--- NEW FILE fedora.readme ---
This file provides some basic information about Broadcom STA wireless
driver configuration files on Fedora with RPMFusion packages.
------------------------------------------------------------------------
Version 0.1 - Tue Nov 06 2012 - initial release
------------------------------------------------------------------------
0. Cautions
===========
The files mentioned in this document should not be used in a wireless
operational system. Only failing wireless system should give a try to
this file proposed solutions.
Use them at your own risk and only if your system could not boot
properly or if your Broadcom wireless device doesn't work correctly.
1. Choosing between WEXT or CFG80211 API
========================================
Some configurations require the user to choose between the WEXT API or
CFG80211 API in order to get Broadcom STA wireless driver properly
loaded, and correctly usable by third-party softwares.
Since this driver cannot be configured on-the-fly, the only solution is
to use RPMFusion akmod-wl package only and set the
/etc/akmods/akmod-wl/api file correctly.
No RPMFusion kmod-wl package installed will take care of the settings
provided in the /etc/akmods/akmod-wl/api file, and using this file
requires an exclusive usage of the akmod-wl package.
/etc/akmods/akmod-wl/api file should contain only one line depending on
the API choosen:
API=WEXT
to force building the module with WEXT API or
API=CFG80211
to force building the module with CFG80211 API or
#API=WEXT
or
#API=CFG80211
to let the Broadcom included Makefile do the right choice according to
your current kernel version.
#API=WEXT is the default setting.
Once this file modified, one should rebuild current kmod-wl package for
the current kernel by typing this command:
akmods --force --kernel `uname -r` --akmod wl
Reboot should be needed in order to get last wl module correctly loaded.
Caution :
---------
WEXT API will be dropped from future kernels according to
https://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commi...
This workaround should only used on compatibles kernels with the
WEXT API.
One should considere to switch to higher wireless compatible Fedora
Release in order to get the most recent CFG80211 API with most recent
kernel.
This workaround will be dropped from the future broadcom-wl, kmod-wl and
akmod-wl packages when the WEXT API will be dropped too.
2. Initramfs configuration file usage
=====================================
Please read comments in /etc/dracut.conf.d/20-wl.conf file in order to
configure loading modules needed by the Broadcom STA wireless driver in
kernel's init ramdisks.
Edit the /etc/dracut.conf.d/20-wl.conf file and comment/uncomment the
one line "add_drivers+=" directive depending on your choice.
For example
# nano /etc/dracut.conf.d/20-wl.conf
or
# sudo nano /etc/dracut.conf.d/20-wl.conf
should let you to modify this file, ctrl+o would save the file, and
ctrl+x should quit nano.
Then use dracut command to rebuild your current kernel initramfs file.
See http://people.redhat.com/harald/dracut.html#id489921 and
http://people.redhat.com/harald/dracut.html#dracutconf5 for complete
explanations on using dracut.
3. Support
==========
Support only about these configuration files will be provided on:
https://bugzilla.rpmfusion.org/enter_bug.cgi?product=Fedora
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-18/broadcom-wl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- broadcom-wl.spec 19 Apr 2012 21:51:22 -0000 1.18
+++ broadcom-wl.spec 21 Nov 2012 12:27:28 -0000 1.19
@@ -1,6 +1,6 @@
Name: broadcom-wl
Version: 5.100.82.112
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -9,6 +9,9 @@
Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11...
Source2: http://www.broadcom.com/docs/linux_sta/README.txt
Source3: broadcom-wl-blacklist.conf
+Source4: 20-wl.conf
+Source5: api
+Source6: fedora.readme
Patch0: broadcom-wl-5.100.82.112-license.patch
BuildArch: noarch
@@ -29,7 +32,8 @@
iconv -f iso8859-1 -t UTF8 lib/LICENSE.txt -o lib/LICENSE.txt
sed -i 's/\r$//' lib/LICENSE.txt
cp -p %{SOURCE2} .
-chmod 644 lib/LICENSE.txt README.txt
+cp -p %{SOURCE6} .
+chmod 644 lib/LICENSE.txt README.txt fedora.readme
%patch0 -p1 -b .license
%build
@@ -37,18 +41,29 @@
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
-install -p -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/
+install -p -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/dracut.conf.d/
+install -p -m0644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/dracut.conf.d/
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/akmods/akmod-wl/
+install -p -m0644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/akmods/akmod-wl/
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc lib/LICENSE.txt README.txt
+%doc lib/LICENSE.txt README.txt fedora.readme
%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist.conf
+%config(noreplace) %{_sysconfdir}/dracut.conf.d/20-wl.conf
+%config(noreplace) %{_sysconfdir}/akmods/akmod-wl/api
%changelog
+* Wed Nov 21 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3
+- Added /etc/dracut.conf.d/20-wl.conf to workaround #2526
+- Added /etc/akmods/akmod-wl/api to workaround #2548 #2562
+- fedora.readme added to explain usage of the above
+
* Thu Apr 19 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-2
- Rebuilt to correct release number
11 years, 10 months
rpms/broadcom-wl/devel 20-wl.conf, NONE, 1.1 api, NONE, 1.1 fedora.readme, NONE, 1.1 broadcom-wl.spec, 1.18, 1.19
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/broadcom-wl/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23348
Modified Files:
broadcom-wl.spec
Added Files:
20-wl.conf api fedora.readme
Log Message:
* Wed Nov 21 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3
- Added /etc/dracut.conf.d/20-wl.conf to workaround #2526
- Added /etc/akmods/akmod-wl/api to workaround #2548 #2562
- fedora.readme added to explain usage of the above
--- NEW FILE 20-wl.conf ---
## /etc/dracut.conf.d/20-wl.conf file
##
## Explanation:
##
## Use only with Broadcom STA wireless driver provided by RPMFusion
## broadcom-wl, akmod-wl and kmod-wl packages.
## Provides required modules in order to avoid kernel 3.6.X panic at
## boot time on certain platforms such as HP Pavilion dm1 Notebook PC.
## See https://bugzilla.rpmfusion.org/show_bug.cgi?id=2526#c29 for an
## example of possible issues.
## To be able to boot the failing kernel, one should add wl.disable=1
## to the grub boot command.
##
## Usage:
##
## - Uncomment the line beginning with "add_drivers+=" below to add the
## required module to your current and future kernels. Then Rebuild
## the current kernel initramfs file by typing "dracut" in a root
## console.
##
## - Comment the line beginning with "add_drivers+=" below to remove the
## required module of your current and future kernels. Then Rebuild
## the current kernel initramfs file by typing "dracut" in a root
## console.
##
## Caution:
##
## Consider to rebuild your initramfs file every time it is needed.
##
## See http://people.redhat.com/harald/dracut.html#id489921 and
## http://people.redhat.com/harald/dracut.html#dracutconf5 for
## complete explanations on using dracut.
##
## State:
##
## Disabled by default
##
#add_drivers+="lib80211 lib80211_crypt_tkip wl"
--- NEW FILE api ---
#API=WEXT
--- NEW FILE fedora.readme ---
This file provides some basic information about Broadcom STA wireless
driver configuration files on Fedora with RPMFusion packages.
------------------------------------------------------------------------
Version 0.1 - Tue Nov 06 2012 - initial release
------------------------------------------------------------------------
0. Cautions
===========
The files mentioned in this document should not be used in a wireless
operational system. Only failing wireless system should give a try to
this file proposed solutions.
Use them at your own risk and only if your system could not boot
properly or if your Broadcom wireless device doesn't work correctly.
1. Choosing between WEXT or CFG80211 API
========================================
Some configurations require the user to choose between the WEXT API or
CFG80211 API in order to get Broadcom STA wireless driver properly
loaded, and correctly usable by third-party softwares.
Since this driver cannot be configured on-the-fly, the only solution is
to use RPMFusion akmod-wl package only and set the
/etc/akmods/akmod-wl/api file correctly.
No RPMFusion kmod-wl package installed will take care of the settings
provided in the /etc/akmods/akmod-wl/api file, and using this file
requires an exclusive usage of the akmod-wl package.
/etc/akmods/akmod-wl/api file should contain only one line depending on
the API choosen:
API=WEXT
to force building the module with WEXT API or
API=CFG80211
to force building the module with CFG80211 API or
#API=WEXT
or
#API=CFG80211
to let the Broadcom included Makefile do the right choice according to
your current kernel version.
#API=WEXT is the default setting.
Once this file modified, one should rebuild current kmod-wl package for
the current kernel by typing this command:
akmods --force --kernel `uname -r` --akmod wl
Reboot should be needed in order to get last wl module correctly loaded.
Caution :
---------
WEXT API will be dropped from future kernels according to
https://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commi...
This workaround should only used on compatibles kernels with the
WEXT API.
One should considere to switch to higher wireless compatible Fedora
Release in order to get the most recent CFG80211 API with most recent
kernel.
This workaround will be dropped from the future broadcom-wl, kmod-wl and
akmod-wl packages when the WEXT API will be dropped too.
2. Initramfs configuration file usage
=====================================
Please read comments in /etc/dracut.conf.d/20-wl.conf file in order to
configure loading modules needed by the Broadcom STA wireless driver in
kernel's init ramdisks.
Edit the /etc/dracut.conf.d/20-wl.conf file and comment/uncomment the
one line "add_drivers+=" directive depending on your choice.
For example
# nano /etc/dracut.conf.d/20-wl.conf
or
# sudo nano /etc/dracut.conf.d/20-wl.conf
should let you to modify this file, ctrl+o would save the file, and
ctrl+x should quit nano.
Then use dracut command to rebuild your current kernel initramfs file.
See http://people.redhat.com/harald/dracut.html#id489921 and
http://people.redhat.com/harald/dracut.html#dracutconf5 for complete
explanations on using dracut.
3. Support
==========
Support only about these configuration files will be provided on:
https://bugzilla.rpmfusion.org/enter_bug.cgi?product=Fedora
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/broadcom-wl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- broadcom-wl.spec 19 Apr 2012 21:51:22 -0000 1.18
+++ broadcom-wl.spec 21 Nov 2012 12:19:49 -0000 1.19
@@ -1,6 +1,6 @@
Name: broadcom-wl
Version: 5.100.82.112
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -9,6 +9,9 @@
Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11...
Source2: http://www.broadcom.com/docs/linux_sta/README.txt
Source3: broadcom-wl-blacklist.conf
+Source4: 20-wl.conf
+Source5: api
+Source6: fedora.readme
Patch0: broadcom-wl-5.100.82.112-license.patch
BuildArch: noarch
@@ -29,7 +32,8 @@
iconv -f iso8859-1 -t UTF8 lib/LICENSE.txt -o lib/LICENSE.txt
sed -i 's/\r$//' lib/LICENSE.txt
cp -p %{SOURCE2} .
-chmod 644 lib/LICENSE.txt README.txt
+cp -p %{SOURCE6} .
+chmod 644 lib/LICENSE.txt README.txt fedora.readme
%patch0 -p1 -b .license
%build
@@ -37,18 +41,29 @@
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
-install -p -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/
+install -p -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/dracut.conf.d/
+install -p -m0644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/dracut.conf.d/
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/akmods/akmod-wl/
+install -p -m0644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/akmods/akmod-wl/
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc lib/LICENSE.txt README.txt
+%doc lib/LICENSE.txt README.txt fedora.readme
%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist.conf
+%config(noreplace) %{_sysconfdir}/dracut.conf.d/20-wl.conf
+%config(noreplace) %{_sysconfdir}/akmods/akmod-wl/api
%changelog
+* Wed Nov 21 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3
+- Added /etc/dracut.conf.d/20-wl.conf to workaround #2526
+- Added /etc/akmods/akmod-wl/api to workaround #2548 #2562
+- fedora.readme added to explain usage of the above
+
* Thu Apr 19 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-2
- Rebuilt to correct release number
11 years, 10 months
rpms/wl-kmod/devel broadcom-wl-5.100.82.112-wext_workaround.patch, NONE, 1.1 broadcom-wl-5.100.82.112-kernel-3.2.patch, 1.1, 1.2 broadcom-wl-5.100.82.112-kernel-3.6.patch, 1.2, 1.3 broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch, 1.1, 1.2 broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch, 1.1, 1.2 wl-kmod.spec, 1.70, 1.71
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23071
Modified Files:
broadcom-wl-5.100.82.112-kernel-3.2.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
wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-wext_workaround.patch
Log Message:
* Wed Nov 21 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-7
- Added patch to choose API at build time (WEXT or CFG80211) to workaround #2548 #2562
- Others patches cleaned-up
broadcom-wl-5.100.82.112-wext_workaround.patch:
Makefile | 14 ++++++++++++++
1 file changed, 14 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-wext_workaround.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 2012-10-10 14:34:17.000000000 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/Makefile 2012-11-09 14:25:09.755455777 +0100
@@ -13,6 +13,8 @@
#
# $Id: Makefile_kbuild_portsrc,v 1.6.54.4 2011-01-27 00:55:34 Exp $
+API_ETC_FILE := /etc/akmods/akmod-wl/api
+
ifneq ($(KERNELRELEASE),)
LINUXVER_GOODFOR_CFG80211:=$(strip $(shell \
@@ -31,6 +33,18 @@
fi \
))
+ API_FILE:=$(strip $(shell \
+ if [ -r "$(API_ETC_FILE)" ]; then \
+ echo TRUE; \
+ else \
+ echo FALSE; \
+ fi \
+ ))
+
+ ifeq ($(API_FILE), TRUE)
+ include $(API_ETC_FILE)
+ endif
+
ifneq ($(API),)
ifeq ($(API), CFG80211)
APICHOICE := FORCE_CFG80211
broadcom-wl-5.100.82.112-kernel-3.2.patch:
wl_linux.c | 4 ++++
1 file changed, 4 insertions(+)
Index: broadcom-wl-5.100.82.112-kernel-3.2.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/broadcom-wl-5.100.82.112-kernel-3.2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- broadcom-wl-5.100.82.112-kernel-3.2.patch 9 Jan 2012 21:36:14 -0000 1.1
+++ broadcom-wl-5.100.82.112-kernel-3.2.patch 21 Nov 2012 12:16:10 -0000 1.2
@@ -5,7 +5,7 @@
#endif
.ndo_get_stats = wl_get_stats,
.ndo_set_mac_address = wl_set_mac_address,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 42) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0))
+ .ndo_set_rx_mode = wl_set_multicast_list,
+#else
.ndo_set_multicast_list = wl_set_multicast_list,
broadcom-wl-5.100.82.112-kernel-3.6.patch:
wl_cfg80211.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
Index: broadcom-wl-5.100.82.112-kernel-3.6.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/broadcom-wl-5.100.82.112-kernel-3.6.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- broadcom-wl-5.100.82.112-kernel-3.6.patch 17 Oct 2012 06:03:55 -0000 1.2
+++ broadcom-wl-5.100.82.112-kernel-3.6.patch 21 Nov 2012 12:16:10 -0000 1.3
@@ -1,33 +1,32 @@
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 @@
++++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c 2012-11-07 17:34:38.141769328 +0100
+@@ -42,7 +42,10 @@
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, struct net_device *ndev,
+static s32 wl_cfg80211_scan(struct wiphy *wiphy,
-+#else
- static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
++ 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 @@
+@@ -570,10 +573,16 @@
}
static s32
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+-wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
+wl_cfg80211_scan(struct wiphy *wiphy,
-+#else
- wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
++ 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);
++ struct net_device *ndev = request->wdev->netdev;
+#endif
CHECK_SYS_UP();
broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch:
wl_cfg80211.c | 14 ++++++++------
wl_linux.c | 6 +-----
2 files changed, 9 insertions(+), 11 deletions(-)
Index: broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch 20 Oct 2012 15:48:16 -0000 1.1
+++ broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch 21 Nov 2012 12:16:10 -0000 1.2
@@ -1,21 +1,31 @@
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 @@
+--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.c 2012-11-07 17:34:38.141769328 +0100
++++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c 2012-11-07 18:16:51.342521040 +0100
+@@ -1475,13 +1475,15 @@
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) {
+- return err;
++ if (err != -EINVAL)
+ // Don't fill syslog with EINVAL error
+ WL_ERR(("Could not get rssi (%d)\n", err));
-+ }
- return err;
++ } else {
++ rssi = dtoh32(scb_val.val);
++ sinfo->filled |= STATION_INFO_SIGNAL;
++ sinfo->signal = rssi;
++ WL_DBG(("RSSI %d dBm\n", rssi));
}
- rssi = dtoh32(scb_val.val);
+- rssi = dtoh32(scb_val.val);
+- sinfo->filled |= STATION_INFO_SIGNAL;
+- sinfo->signal = rssi;
+- WL_DBG(("RSSI %d dBm\n", rssi));
+ }
+
+ return err;
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
+--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c 2012-11-07 17:52:29.434087011 +0100
++++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c 2012-11-07 17:59:01.626202471 +0100
@@ -1587,11 +1587,7 @@
}
broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch:
wl_cfg80211.h | 2 ++
wl_iw.h | 1 +
wl_linux.h | 2 ++
3 files changed, 5 insertions(+)
Index: broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch 20 Oct 2012 15:48:16 -0000 1.1
+++ broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch 21 Nov 2012 12:16:10 -0000 1.2
@@ -1,3 +1,15 @@
+diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.h hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.h
+--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.h 2011-10-22 18:56:55.000000000 +0200
++++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.h 2012-11-07 18:04:55.286309234 +0100
+@@ -16,6 +16,8 @@
+ #ifndef _wl_cfg80211_h_
+ #define _wl_cfg80211_h_
+
++#include <linux/semaphore.h>
++
+ #include <net/cfg80211.h>
+ #include <wlioctl.h>
+
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
@@ -9,3 +21,15 @@
#include <linux/wireless.h>
#include <typedefs.h>
+diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.h hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.h
+--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.h 2011-10-22 18:56:55.000000000 +0200
++++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.h 2012-11-07 18:04:55.394309261 +0100
+@@ -15,6 +15,8 @@
+ #ifndef _wl_linux_h_
+ #define _wl_linux_h_
+
++#include <linux/semaphore.h>
++
+ #include <wlc_types.h>
+
+ typedef struct wl_timer {
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- wl-kmod.spec 20 Oct 2012 15:48:16 -0000 1.70
+++ wl-kmod.spec 21 Nov 2012 12:16:10 -0000 1.71
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.100.82.112
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -22,6 +22,7 @@
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
+Patch7: broadcom-wl-5.100.82.112-wext_workaround.patch
BuildRequires: %{_bindir}/kmodtool
@@ -40,7 +41,9 @@
BCM4322-, BCM43224-, and BCM43225-, BCM43227- and BCM43228-based hardware.
NOTE: You must read the LICENSE.txt file in the docs directory before using
-this software.
+this software. You should read the fedora.readme file in the docs directory
+in order to know how to configure this software if you encounter problems
+while boot sequence or with the CFG80211 API (revert to the WEXT API).
%prep
# error out if there was something wrong with kmodtool
@@ -64,6 +67,7 @@
%patch4 -p1 -b .kernel-3.6
%patch5 -p1 -b .recent_kernel_semaphore
%patch6 -p1 -b .recent_kernel_ioctl
+%patch7 -p1 -b .wext_workaround.patch
popd
for kernel_version in %{?kernel_versions} ; do
@@ -93,6 +97,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Nov 21 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-7
+- Added patch to choose API at build time (WEXT or CFG80211) to workaround #2548 #2562
+- Others patches cleaned-up
+
* Sat Oct 20 2012 Nicolas Vieville <nicolas.vieville(a)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
11 years, 10 months