rpms/xorg-x11-drv-fglrx/F-10 xorg-x11-drv-fglrx.spec,1.14,1.15
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24374/F-10
Modified Files:
xorg-x11-drv-fglrx.spec
Log Message:
* Wed Dec 31 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-6.8.12
- symlink needs to be ../lib64/dri, not ../lib64
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-fglrx.spec 30 Dec 2008 23:11:13 -0000 1.14
+++ xorg-x11-drv-fglrx.spec 31 Dec 2008 18:46:58 -0000 1.15
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-fglrx
Version: 8.561
-Release: 5.%{ativersion}%{?dist}
+Release: 6.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: BSD/Commercial/GPL/QPL
@@ -241,7 +241,7 @@
%ifarch x86_64
# dri workaround
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/dri
-ln -s ../lib64/fglrx_dri.so $RPM_BUILD_ROOT%{_prefix}/lib/dri/
+ln -s ../../lib64/dri/fglrx_dri.so $RPM_BUILD_ROOT%{_prefix}/lib/dri/
%endif
%clean
@@ -323,6 +323,9 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Wed Dec 31 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-6.8.12
+- symlink needs to be ../lib64/dri, not ../lib64
+
* Tue Dec 30 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-5.8.12
- Only create symlink for dri workaround on x86_64
15 years, 10 months
rpms/xorg-x11-drv-fglrx/F-9 xorg-x11-drv-fglrx.spec,1.12,1.13
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24374/F-9
Modified Files:
xorg-x11-drv-fglrx.spec
Log Message:
* Wed Dec 31 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-6.8.12
- symlink needs to be ../lib64/dri, not ../lib64
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-fglrx.spec 30 Dec 2008 23:11:13 -0000 1.12
+++ xorg-x11-drv-fglrx.spec 31 Dec 2008 18:46:58 -0000 1.13
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-fglrx
Version: 8.561
-Release: 4.%{ativersion}%{?dist}
+Release: 5.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: BSD/Commercial/GPL/QPL
@@ -230,7 +230,7 @@
%ifarch x86_64
# dri workaround
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/dri
-ln -s ../lib64/fglrx_dri.so $RPM_BUILD_ROOT%{_prefix}/lib/dri/
+ln -s ../../lib64/dri/fglrx_dri.so $RPM_BUILD_ROOT%{_prefix}/lib/dri/
%endif
%clean
@@ -310,6 +310,9 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Wed Dec 31 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-5.8.12
+- symlink needs to be ../lib64/dri, not ../lib64
+
* Tue Dec 30 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-4.8.12
- Only create symlink for dri workaround on x86_64
15 years, 10 months
rpms/mythtv-themes/devel mythtv-themes.spec,1.2,1.3
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv-themes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18410
Modified Files:
mythtv-themes.spec
Log Message:
* Wed Dec 31 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19506
- Update to pre-0.22 svn trunk, rev 19506
Index: mythtv-themes.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/devel/mythtv-themes.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythtv-themes.spec 18 Dec 2008 02:23:41 -0000 1.2
+++ mythtv-themes.spec 31 Dec 2008 16:51:23 -0000 1.3
@@ -17,7 +17,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r19390
+%define _svnrev r19506
%define branch trunk
#
@@ -111,6 +111,9 @@
%{_datadir}/mythtv/themes/*
%changelog
+* Wed Dec 31 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19506
+- Update to pre-0.22 svn trunk, rev 19506
+
* Wed Dec 17 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19390
- Build svn trunk themes to go with svn trunk mythtv, rev 19390
- Drop glass-wide
15 years, 10 months
rpms/mythtv/devel mythtv.spec,1.16,1.17
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18056
Modified Files:
mythtv.spec
Log Message:
* Wed Dec 31 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19506
- Update to pre-0.22 svn trunk, revision 19506
- Re-disable mythgame-emulators sub-pgk, was accidentally re-enabled
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mythtv.spec 18 Dec 2008 02:15:42 -0000 1.16
+++ mythtv.spec 31 Dec 2008 16:50:52 -0000 1.17
@@ -66,7 +66,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r19390
+%define _svnrev r19506
%define branch trunk
#
@@ -689,27 +689,27 @@
A game frontend (xmame, nes, snes, pc) for MythTV.
################################################################################
-%package -n mythgame-emulators
-Summary: Meta-package requiring emulators for game types mythgame knows about
-Group: Applications/Multimedia
-Requires: mythgame = %{version}-%{release}
+#package -n mythgame-emulators
+#Summary: Meta-package requiring emulators for game types mythgame knows about
+#Group: Applications/Multimedia
+#Requires: mythgame = %{version}-%{release}
# Multi Arcade Machine Emulator, Amiga, Atari 2600
-Requires: sdlmame
-Requires: e-uae
-Requires: stella
+#Requires: sdlmame
+#Requires: e-uae
+#Requires: stella
# Nintendo, Super Nintendo, Nintendo 64
-Requires: fceultra
-Requires: zsnes
-Requires: mupen64, mupen64-ricevideo
+#Requires: fceultra
+#Requires: zsnes
+#Requires: mupen64, mupen64-ricevideo
# Sega Genesis, Sega Master System, Game Gear
-Requires: gens
-Requires: dega-sdl
-Requires: osmose
+#Requires: gens
+#Requires: dega-sdl
+#Requires: osmose
# TurboGraphx 16 (and others)
-Requires: mednafen
+#Requires: mednafen
-%description -n mythgame-emulators
-Meta-package requiring emulators for game types mythgame knows about.
+#description -n mythgame-emulators
+#Meta-package requiring emulators for game types mythgame knows about.
%endif
################################################################################
@@ -1458,11 +1458,11 @@
%{_datadir}/mythtv/game_settings.xml
%{_datadir}/mythtv/i18n/mythgame_*.qm
-%files -n mythgame-emulators
-%defattr(-,root,root,-)
-%{_datadir}/mythtv/games/xmame
-%{_datadir}/mame/screens
-%{_datadir}/mame/flyers
+#files -n mythgame-emulators
+#defattr(-,root,root,-)
+#{_datadir}/mythtv/games/xmame
+#{_datadir}/mame/screens
+#{_datadir}/mame/flyers
%endif
%if %{with_mythmovies}
@@ -1560,6 +1560,13 @@
################################################################################
%changelog
+* Wed Dec 31 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19506
+- Update to pre-0.22 svn trunk, revision 19506
+- Re-disable mythgame-emulators sub-pgk, was accidentally re-enabled
+
+* Sun Dec 28 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19467
+- Update to pre-0.22 svn trunk, revision 19467
+
* Mon Dec 15 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19390
- MythTV svn trunk (pre-0.22), revision 19390
- Re-enable fast cmov on x86_64 by default
15 years, 10 months
rpms/broadcom-wl/devel .cvsignore, 1.2, 1.3 broadcom-wl.spec, 1.2, 1.3 sources, 1.2, 1.3
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/broadcom-wl/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12872
Modified Files:
.cvsignore broadcom-wl.spec sources
Log Message:
* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
- Update version to 5.10.27.11
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 7 Nov 2008 21:01:54 -0000 1.2
+++ .cvsignore 31 Dec 2008 15:10:08 -0000 1.3
@@ -1 +1 @@
-hybrid-portsrc-x86_32_5_10_27_6.tar.gz
+hybrid-portsrc-x86-32_5_10_27_11.tar.gz
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/broadcom-wl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- broadcom-wl.spec 20 Dec 2008 12:39:52 -0000 1.2
+++ broadcom-wl.spec 31 Dec 2008 15:10:08 -0000 1.3
@@ -1,11 +1,11 @@
Name: broadcom-wl
-Version: 5.10.27.6
-Release: 4%{?dist}
+Version: 5.10.27.11
+Release: 1%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32_5_10_27_6.ta...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86-32_5_10_27_11.t...
Source1: http://www.broadcom.com/docs/linux_sta/README.txt
Source2: broadcom-wl-blacklist
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +46,9 @@
%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist
%changelog
+* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
+- Update version to 5.10.27.11
+
* Sat Dec 20 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-4
- ExcludeArch ppc, ppc64
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 7 Nov 2008 21:01:54 -0000 1.2
+++ sources 31 Dec 2008 15:10:08 -0000 1.3
@@ -1 +1 @@
-7f50d89179e637225bd97022b323c27e hybrid-portsrc-x86_32_5_10_27_6.tar.gz
+82c8f4312cf809fea2dcb175eb8e0036 hybrid-portsrc-x86-32_5_10_27_11.tar.gz
15 years, 10 months
rpms/broadcom-wl/F-9 .cvsignore, 1.2, 1.3 broadcom-wl.spec, 1.2, 1.3 sources, 1.2, 1.3
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/broadcom-wl/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12720
Modified Files:
.cvsignore broadcom-wl.spec sources
Log Message:
* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
- Update version to 5.10.27.11
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 7 Nov 2008 21:38:56 -0000 1.2
+++ .cvsignore 31 Dec 2008 15:07:31 -0000 1.3
@@ -1 +1 @@
-hybrid-portsrc-x86_32_5_10_27_6.tar.gz
+hybrid-portsrc-x86-32_5_10_27_11.tar.gz
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-9/broadcom-wl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- broadcom-wl.spec 20 Dec 2008 12:54:32 -0000 1.2
+++ broadcom-wl.spec 31 Dec 2008 15:07:31 -0000 1.3
@@ -1,11 +1,11 @@
Name: broadcom-wl
-Version: 5.10.27.6
-Release: 4%{?dist}
+Version: 5.10.27.11
+Release: 1%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32_5_10_27_6.ta...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86-32_5_10_27_11.t...
Source1: http://www.broadcom.com/docs/linux_sta/README.txt
Source2: broadcom-wl-blacklist
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +46,9 @@
%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist
%changelog
+* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
+- Update version to 5.10.27.11
+
* Sat Dec 20 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-4
- ExcludeArch ppc, ppc64
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 7 Nov 2008 21:38:56 -0000 1.2
+++ sources 31 Dec 2008 15:07:31 -0000 1.3
@@ -1 +1 @@
-7f50d89179e637225bd97022b323c27e hybrid-portsrc-x86_32_5_10_27_6.tar.gz
+82c8f4312cf809fea2dcb175eb8e0036 hybrid-portsrc-x86-32_5_10_27_11.tar.gz
15 years, 10 months
rpms/broadcom-wl/F-8 .cvsignore, 1.2, 1.3 broadcom-wl.spec, 1.1, 1.2 sources, 1.2, 1.3
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/broadcom-wl/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12290
Modified Files:
.cvsignore broadcom-wl.spec sources
Log Message:
* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
- Update version to 5.10.27.11
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 7 Nov 2008 21:47:04 -0000 1.2
+++ .cvsignore 31 Dec 2008 15:05:34 -0000 1.3
@@ -1 +1 @@
-hybrid-portsrc-x86_32_5_10_27_6.tar.gz
+hybrid-portsrc-x86-32_5_10_27_11.tar.gz
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-8/broadcom-wl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- broadcom-wl.spec 7 Nov 2008 21:47:04 -0000 1.1
+++ broadcom-wl.spec 31 Dec 2008 15:05:34 -0000 1.2
@@ -1,11 +1,11 @@
Name: broadcom-wl
-Version: 5.10.27.6
-Release: 3%{?dist}
+Version: 5.10.27.11
+Release: 1%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32_5_10_27_6.ta...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86-32_5_10_27_11.t...
Source1: http://www.broadcom.com/docs/linux_sta/README.txt
Source2: broadcom-wl-blacklist
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,9 @@
%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist
%changelog
+* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
+- Update version to 5.10.27.11
+
* Fri Nov 07 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-3
- Updated README.txt file
- Cleaned up spec file
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 7 Nov 2008 21:47:04 -0000 1.2
+++ sources 31 Dec 2008 15:05:34 -0000 1.3
@@ -1 +1 @@
-7f50d89179e637225bd97022b323c27e hybrid-portsrc-x86_32_5_10_27_6.tar.gz
+82c8f4312cf809fea2dcb175eb8e0036 hybrid-portsrc-x86-32_5_10_27_11.tar.gz
15 years, 10 months
rpms/wl-kmod/devel broadcom-wl-5.10.27.11-kernel-2.6.27.patch, NONE, 1.1 broadcom-wl-5.10.27.11-vlanmode.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wl-kmod.spec, 1.11, 1.12
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11847
Modified Files:
.cvsignore sources wl-kmod.spec
Added Files:
broadcom-wl-5.10.27.11-kernel-2.6.27.patch
broadcom-wl-5.10.27.11-vlanmode.patch
Log Message:
* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
- Update version to 5.10.27.11
broadcom-wl-5.10.27.11-kernel-2.6.27.patch:
--- NEW FILE broadcom-wl-5.10.27.11-kernel-2.6.27.patch ---
diff -Naur broadcom-wl.old/src/wl/sys/wl_iw.c broadcom-wl/src/wl/sys/wl_iw.c
--- broadcom-wl.old/src/wl/sys/wl_iw.c 2008-12-05 19:45:54.000000000 +0000
+++ broadcom-wl/src/wl/sys/wl_iw.c 2008-12-22 14:03:42.000000000 +0000
@@ -943,12 +943,12 @@
iwe.cmd = SIOCGIWAP;
iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
memcpy(iwe.u.ap_addr.sa_data, &bi->BSSID, ETHER_ADDR_LEN);
- event = iwe_stream_add_event(event, end, &iwe, IW_EV_ADDR_LEN);
+ event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_ADDR_LEN);
iwe.u.data.length = dtoh32(bi->SSID_len);
iwe.cmd = SIOCGIWESSID;
iwe.u.data.flags = 1;
- event = iwe_stream_add_point(event, end, &iwe, bi->SSID);
+ event = iwe_stream_add_point(info, event, end, &iwe, bi->SSID);
if (dtoh16(bi->capability) & (DOT11_CAP_ESS | DOT11_CAP_IBSS)) {
iwe.cmd = SIOCGIWMODE;
@@ -956,7 +956,7 @@
iwe.u.mode = IW_MODE_INFRA;
else
iwe.u.mode = IW_MODE_ADHOC;
- event = iwe_stream_add_event(event, end, &iwe, IW_EV_UINT_LEN);
+ event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_UINT_LEN);
}
iwe.cmd = SIOCGIWFREQ;
@@ -964,13 +964,13 @@
CHSPEC_CHANNEL(bi->chanspec) <= CH_MAX_2G_CHANNEL ?
WF_CHAN_FACTOR_2_4_G : WF_CHAN_FACTOR_5_G);
iwe.u.freq.e = 6;
- event = iwe_stream_add_event(event, end, &iwe, IW_EV_FREQ_LEN);
+ event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_FREQ_LEN);
iwe.cmd = IWEVQUAL;
iwe.u.qual.qual = rssi_to_qual(dtoh16(bi->RSSI));
iwe.u.qual.level = 0x100 + dtoh16(bi->RSSI);
iwe.u.qual.noise = 0x100 + bi->phy_noise;
- event = iwe_stream_add_event(event, end, &iwe, IW_EV_QUAL_LEN);
+ event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_QUAL_LEN);
#if WIRELESS_EXT > 17
@@ -982,7 +982,7 @@
if ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_RSN_ID))) {
iwe.cmd = IWEVGENIE;
iwe.u.data.length = ie->len + 2;
- event = iwe_stream_add_point(event, end, &iwe, (char *)ie);
+ event = iwe_stream_add_point(info, event, end, &iwe, (char *)ie);
}
ptr = ((uint8 *)bi) + sizeof(wl_bss_info_t);
while ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_WPA_ID))) {
@@ -990,7 +990,7 @@
if (ie_is_wps_ie(((uint8 **)&ie), &ptr, &ptr_len)) {
iwe.cmd = IWEVGENIE;
iwe.u.data.length = ie->len + 2;
- event = iwe_stream_add_point(event, end, &iwe, (char *)ie);
+ event = iwe_stream_add_point(info, event, end, &iwe, (char *)ie);
break;
}
}
@@ -1001,7 +1001,7 @@
if (ie_is_wpa_ie(((uint8 **)&ie), &ptr, &ptr_len)) {
iwe.cmd = IWEVGENIE;
iwe.u.data.length = ie->len + 2;
- event = iwe_stream_add_point(event, end, &iwe, (char *)ie);
+ event = iwe_stream_add_point(info, event, end, &iwe, (char *)ie);
goto done;
}
}
@@ -1015,7 +1015,7 @@
else
iwe.u.data.flags = IW_ENCODE_DISABLED;
iwe.u.data.length = 0;
- event = iwe_stream_add_point(event, end, &iwe, (char *)event);
+ event = iwe_stream_add_point(info, event, end, &iwe, (char *)event);
if (bi->rateset.count) {
value = event + IW_EV_LCP_LEN;
@@ -1024,7 +1024,7 @@
iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
for (j = 0; j < bi->rateset.count && j < IW_MAX_BITRATES; j++) {
iwe.u.bitrate.value = (bi->rateset.rates[j] & 0x7f) * 500000;
- value = iwe_stream_add_value(event, value, end, &iwe,
+ value = iwe_stream_add_value(info, event, value, end, &iwe,
IW_EV_PARAM_LEN);
}
event = value;
broadcom-wl-5.10.27.11-vlanmode.patch:
--- NEW FILE broadcom-wl-5.10.27.11-vlanmode.patch ---
diff -Naur broadcom-wl.old/src/wl/sys/wl_iw.c broadcom-wl/src/wl/sys/wl_iw.c
--- broadcom-wl.old/src/wl/sys/wl_iw.c 2008-12-22 14:08:06.000000000 +0000
+++ broadcom-wl/src/wl/sys/wl_iw.c 2008-12-22 14:11:18.000000000 +0000
@@ -124,7 +124,7 @@
return ret;
}
-static int
+int
dev_wlc_intvar_set(
struct net_device *dev,
char *name,
diff -Naur broadcom-wl.old/src/wl/sys/wl_linux.c broadcom-wl/src/wl/sys/wl_linux.c
--- broadcom-wl.old/src/wl/sys/wl_linux.c 2008-12-05 19:46:08.000000000 +0000
+++ broadcom-wl/src/wl/sys/wl_linux.c 2008-12-22 14:17:13.000000000 +0000
@@ -246,6 +246,8 @@
};
MODULE_DEVICE_TABLE(pci, wl_id_table);
+MODULE_LICENSE("MIXED/Proprietary");
+
#ifdef BCMDBG
static int msglevel = 0xdeadbeef;
module_param(msglevel, int, 0);
@@ -288,6 +290,8 @@
#endif
#endif
}
+
+extern int dev_wlc_intvar_set(struct net_device *dev, char *name, int val);
static wl_info_t *
wl_attach(uint16 vendor, uint16 device, ulong regs, uint bustype, void *btparam, uint irq)
@@ -439,6 +443,9 @@
printf("%s: Broadcom BCM%04x 802.11 Wireless Controller " EPI_VERSION_STR,
dev->name, device);
+ /* Work around. Default vlan_mode to off */
+ wlc_iovar_setint(wl->wlc, "vlan_mode", OFF);
+
#ifdef BCMDBG
printf(" (Compiled in " SRCBASE " at " __TIME__ " on " __DATE__ ")");
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2008 11:49:32 -0000 1.2
+++ .cvsignore 31 Dec 2008 14:59:20 -0000 1.3
@@ -1,2 +1,2 @@
-hybrid-portsrc-x86_32_5_10_27_6.tar.gz
-hybrid-portsrc-x86_64_5_10_27_6.tar.gz
+hybrid-portsrc-x86-32_5_10_27_11.tar.gz
+hybrid-portsrc-x86-64_5_10_27_11.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2008 11:49:32 -0000 1.2
+++ sources 31 Dec 2008 14:59:20 -0000 1.3
@@ -1,2 +1,2 @@
-7f50d89179e637225bd97022b323c27e hybrid-portsrc-x86_32_5_10_27_6.tar.gz
-d61e5ad289fc5f0b62e0656f90b451a7 hybrid-portsrc-x86_64_5_10_27_6.tar.gz
+82c8f4312cf809fea2dcb175eb8e0036 hybrid-portsrc-x86-32_5_10_27_11.tar.gz
+78b403352902671252125d3fd00f8a22 hybrid-portsrc-x86-64_5_10_27_11.tar.gz
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wl-kmod.spec 28 Dec 2008 11:41:53 -0000 1.11
+++ wl-kmod.spec 31 Dec 2008 14:59:20 -0000 1.12
@@ -3,20 +3,20 @@
# "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 newest
Name: wl-kmod
-Version: 5.10.27.6
-Release: 5%{?dist}.8
+Version: 5.10.27.11
+Release: 1%{?dist}
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32_5_10_27_6.ta...
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64_5_10_27_6.ta...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86-32_5_10_27_11.t...
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86-64_5_10_27_11.t...
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.10.27.6-kernel-2.6.27.patch
-Patch1: broadcom-wl-5.10.27.6-vlanmode.patch
+Patch0: broadcom-wl-5.10.27.11-kernel-2.6.27.patch
+Patch1: broadcom-wl-5.10.27.11-vlanmode.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -84,6 +84,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
+- Update version to 5.10.27.11
+
* Sun Dec 28 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.8
- rebuild for latest Fedora kernel;
15 years, 10 months
rpms/wl-kmod/F-9 broadcom-wl-5.10.27.11-kernel-2.6.27.patch, NONE, 1.1 broadcom-wl-5.10.27.11-vlanmode.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wl-kmod.spec, 1.11, 1.12
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/wl-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11354
Modified Files:
.cvsignore sources wl-kmod.spec
Added Files:
broadcom-wl-5.10.27.11-kernel-2.6.27.patch
broadcom-wl-5.10.27.11-vlanmode.patch
Log Message:
* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
- Update version to 5.10.27.11
broadcom-wl-5.10.27.11-kernel-2.6.27.patch:
--- NEW FILE broadcom-wl-5.10.27.11-kernel-2.6.27.patch ---
diff -Naur broadcom-wl.old/src/wl/sys/wl_iw.c broadcom-wl/src/wl/sys/wl_iw.c
--- broadcom-wl.old/src/wl/sys/wl_iw.c 2008-12-05 19:45:54.000000000 +0000
+++ broadcom-wl/src/wl/sys/wl_iw.c 2008-12-22 14:03:42.000000000 +0000
@@ -943,12 +943,12 @@
iwe.cmd = SIOCGIWAP;
iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
memcpy(iwe.u.ap_addr.sa_data, &bi->BSSID, ETHER_ADDR_LEN);
- event = iwe_stream_add_event(event, end, &iwe, IW_EV_ADDR_LEN);
+ event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_ADDR_LEN);
iwe.u.data.length = dtoh32(bi->SSID_len);
iwe.cmd = SIOCGIWESSID;
iwe.u.data.flags = 1;
- event = iwe_stream_add_point(event, end, &iwe, bi->SSID);
+ event = iwe_stream_add_point(info, event, end, &iwe, bi->SSID);
if (dtoh16(bi->capability) & (DOT11_CAP_ESS | DOT11_CAP_IBSS)) {
iwe.cmd = SIOCGIWMODE;
@@ -956,7 +956,7 @@
iwe.u.mode = IW_MODE_INFRA;
else
iwe.u.mode = IW_MODE_ADHOC;
- event = iwe_stream_add_event(event, end, &iwe, IW_EV_UINT_LEN);
+ event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_UINT_LEN);
}
iwe.cmd = SIOCGIWFREQ;
@@ -964,13 +964,13 @@
CHSPEC_CHANNEL(bi->chanspec) <= CH_MAX_2G_CHANNEL ?
WF_CHAN_FACTOR_2_4_G : WF_CHAN_FACTOR_5_G);
iwe.u.freq.e = 6;
- event = iwe_stream_add_event(event, end, &iwe, IW_EV_FREQ_LEN);
+ event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_FREQ_LEN);
iwe.cmd = IWEVQUAL;
iwe.u.qual.qual = rssi_to_qual(dtoh16(bi->RSSI));
iwe.u.qual.level = 0x100 + dtoh16(bi->RSSI);
iwe.u.qual.noise = 0x100 + bi->phy_noise;
- event = iwe_stream_add_event(event, end, &iwe, IW_EV_QUAL_LEN);
+ event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_QUAL_LEN);
#if WIRELESS_EXT > 17
@@ -982,7 +982,7 @@
if ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_RSN_ID))) {
iwe.cmd = IWEVGENIE;
iwe.u.data.length = ie->len + 2;
- event = iwe_stream_add_point(event, end, &iwe, (char *)ie);
+ event = iwe_stream_add_point(info, event, end, &iwe, (char *)ie);
}
ptr = ((uint8 *)bi) + sizeof(wl_bss_info_t);
while ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_WPA_ID))) {
@@ -990,7 +990,7 @@
if (ie_is_wps_ie(((uint8 **)&ie), &ptr, &ptr_len)) {
iwe.cmd = IWEVGENIE;
iwe.u.data.length = ie->len + 2;
- event = iwe_stream_add_point(event, end, &iwe, (char *)ie);
+ event = iwe_stream_add_point(info, event, end, &iwe, (char *)ie);
break;
}
}
@@ -1001,7 +1001,7 @@
if (ie_is_wpa_ie(((uint8 **)&ie), &ptr, &ptr_len)) {
iwe.cmd = IWEVGENIE;
iwe.u.data.length = ie->len + 2;
- event = iwe_stream_add_point(event, end, &iwe, (char *)ie);
+ event = iwe_stream_add_point(info, event, end, &iwe, (char *)ie);
goto done;
}
}
@@ -1015,7 +1015,7 @@
else
iwe.u.data.flags = IW_ENCODE_DISABLED;
iwe.u.data.length = 0;
- event = iwe_stream_add_point(event, end, &iwe, (char *)event);
+ event = iwe_stream_add_point(info, event, end, &iwe, (char *)event);
if (bi->rateset.count) {
value = event + IW_EV_LCP_LEN;
@@ -1024,7 +1024,7 @@
iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
for (j = 0; j < bi->rateset.count && j < IW_MAX_BITRATES; j++) {
iwe.u.bitrate.value = (bi->rateset.rates[j] & 0x7f) * 500000;
- value = iwe_stream_add_value(event, value, end, &iwe,
+ value = iwe_stream_add_value(info, event, value, end, &iwe,
IW_EV_PARAM_LEN);
}
event = value;
broadcom-wl-5.10.27.11-vlanmode.patch:
--- NEW FILE broadcom-wl-5.10.27.11-vlanmode.patch ---
diff -Naur broadcom-wl.old/src/wl/sys/wl_iw.c broadcom-wl/src/wl/sys/wl_iw.c
--- broadcom-wl.old/src/wl/sys/wl_iw.c 2008-12-22 14:08:06.000000000 +0000
+++ broadcom-wl/src/wl/sys/wl_iw.c 2008-12-22 14:11:18.000000000 +0000
@@ -124,7 +124,7 @@
return ret;
}
-static int
+int
dev_wlc_intvar_set(
struct net_device *dev,
char *name,
diff -Naur broadcom-wl.old/src/wl/sys/wl_linux.c broadcom-wl/src/wl/sys/wl_linux.c
--- broadcom-wl.old/src/wl/sys/wl_linux.c 2008-12-05 19:46:08.000000000 +0000
+++ broadcom-wl/src/wl/sys/wl_linux.c 2008-12-22 14:17:13.000000000 +0000
@@ -246,6 +246,8 @@
};
MODULE_DEVICE_TABLE(pci, wl_id_table);
+MODULE_LICENSE("MIXED/Proprietary");
+
#ifdef BCMDBG
static int msglevel = 0xdeadbeef;
module_param(msglevel, int, 0);
@@ -288,6 +290,8 @@
#endif
#endif
}
+
+extern int dev_wlc_intvar_set(struct net_device *dev, char *name, int val);
static wl_info_t *
wl_attach(uint16 vendor, uint16 device, ulong regs, uint bustype, void *btparam, uint irq)
@@ -439,6 +443,9 @@
printf("%s: Broadcom BCM%04x 802.11 Wireless Controller " EPI_VERSION_STR,
dev->name, device);
+ /* Work around. Default vlan_mode to off */
+ wlc_iovar_setint(wl->wlc, "vlan_mode", OFF);
+
#ifdef BCMDBG
printf(" (Compiled in " SRCBASE " at " __TIME__ " on " __DATE__ ")");
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2008 11:51:16 -0000 1.2
+++ .cvsignore 31 Dec 2008 14:53:33 -0000 1.3
@@ -1,2 +1,2 @@
-hybrid-portsrc-x86_32_5_10_27_6.tar.gz
-hybrid-portsrc-x86_64_5_10_27_6.tar.gz
+hybrid-portsrc-x86-32_5_10_27_11.tar.gz
+hybrid-portsrc-x86-64_5_10_27_11.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2008 11:51:16 -0000 1.2
+++ sources 31 Dec 2008 14:53:33 -0000 1.3
@@ -1,2 +1,2 @@
-7f50d89179e637225bd97022b323c27e hybrid-portsrc-x86_32_5_10_27_6.tar.gz
-d61e5ad289fc5f0b62e0656f90b451a7 hybrid-portsrc-x86_64_5_10_27_6.tar.gz
+82c8f4312cf809fea2dcb175eb8e0036 hybrid-portsrc-x86-32_5_10_27_11.tar.gz
+78b403352902671252125d3fd00f8a22 hybrid-portsrc-x86-64_5_10_27_11.tar.gz
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-9/wl-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wl-kmod.spec 20 Dec 2008 08:06:28 -0000 1.11
+++ wl-kmod.spec 31 Dec 2008 14:53:33 -0000 1.12
@@ -3,20 +3,20 @@
# "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 newest
Name: wl-kmod
-Version: 5.10.27.6
-Release: 5%{?dist}.5
+Version: 5.10.27.11
+Release: 1%{?dist}
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32_5_10_27_6.ta...
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64_5_10_27_6.ta...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86-32_5_10_27_11.t...
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86-64_5_10_27_11.t...
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.10.27.6-kernel-2.6.27.patch
-Patch1: broadcom-wl-5.10.27.6-vlanmode.patch
+Patch0: broadcom-wl-5.10.27.11-kernel-2.6.27.patch
+Patch1: broadcom-wl-5.10.27.11-vlanmode.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -84,6 +84,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
+- Update version to 5.10.27.11
+
* Sat Dec 20 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.5
- rebuild for latest Fedora kernel;
15 years, 10 months
rpms/wl-kmod/F-8 broadcom-wl-5.10.27.11-kernel-2.6.27.patch, NONE, 1.1 broadcom-wl-5.10.27.11-vlanmode.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wl-kmod.spec, 1.4, 1.5
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/wl-kmod/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10500
Modified Files:
.cvsignore sources wl-kmod.spec
Added Files:
broadcom-wl-5.10.27.11-kernel-2.6.27.patch
broadcom-wl-5.10.27.11-vlanmode.patch
Log Message:
* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
- Update version to 5.10.27.11
broadcom-wl-5.10.27.11-kernel-2.6.27.patch:
--- NEW FILE broadcom-wl-5.10.27.11-kernel-2.6.27.patch ---
diff -Naur broadcom-wl.old/src/wl/sys/wl_iw.c broadcom-wl/src/wl/sys/wl_iw.c
--- broadcom-wl.old/src/wl/sys/wl_iw.c 2008-12-05 19:45:54.000000000 +0000
+++ broadcom-wl/src/wl/sys/wl_iw.c 2008-12-22 14:03:42.000000000 +0000
@@ -943,12 +943,12 @@
iwe.cmd = SIOCGIWAP;
iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
memcpy(iwe.u.ap_addr.sa_data, &bi->BSSID, ETHER_ADDR_LEN);
- event = iwe_stream_add_event(event, end, &iwe, IW_EV_ADDR_LEN);
+ event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_ADDR_LEN);
iwe.u.data.length = dtoh32(bi->SSID_len);
iwe.cmd = SIOCGIWESSID;
iwe.u.data.flags = 1;
- event = iwe_stream_add_point(event, end, &iwe, bi->SSID);
+ event = iwe_stream_add_point(info, event, end, &iwe, bi->SSID);
if (dtoh16(bi->capability) & (DOT11_CAP_ESS | DOT11_CAP_IBSS)) {
iwe.cmd = SIOCGIWMODE;
@@ -956,7 +956,7 @@
iwe.u.mode = IW_MODE_INFRA;
else
iwe.u.mode = IW_MODE_ADHOC;
- event = iwe_stream_add_event(event, end, &iwe, IW_EV_UINT_LEN);
+ event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_UINT_LEN);
}
iwe.cmd = SIOCGIWFREQ;
@@ -964,13 +964,13 @@
CHSPEC_CHANNEL(bi->chanspec) <= CH_MAX_2G_CHANNEL ?
WF_CHAN_FACTOR_2_4_G : WF_CHAN_FACTOR_5_G);
iwe.u.freq.e = 6;
- event = iwe_stream_add_event(event, end, &iwe, IW_EV_FREQ_LEN);
+ event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_FREQ_LEN);
iwe.cmd = IWEVQUAL;
iwe.u.qual.qual = rssi_to_qual(dtoh16(bi->RSSI));
iwe.u.qual.level = 0x100 + dtoh16(bi->RSSI);
iwe.u.qual.noise = 0x100 + bi->phy_noise;
- event = iwe_stream_add_event(event, end, &iwe, IW_EV_QUAL_LEN);
+ event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_QUAL_LEN);
#if WIRELESS_EXT > 17
@@ -982,7 +982,7 @@
if ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_RSN_ID))) {
iwe.cmd = IWEVGENIE;
iwe.u.data.length = ie->len + 2;
- event = iwe_stream_add_point(event, end, &iwe, (char *)ie);
+ event = iwe_stream_add_point(info, event, end, &iwe, (char *)ie);
}
ptr = ((uint8 *)bi) + sizeof(wl_bss_info_t);
while ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_WPA_ID))) {
@@ -990,7 +990,7 @@
if (ie_is_wps_ie(((uint8 **)&ie), &ptr, &ptr_len)) {
iwe.cmd = IWEVGENIE;
iwe.u.data.length = ie->len + 2;
- event = iwe_stream_add_point(event, end, &iwe, (char *)ie);
+ event = iwe_stream_add_point(info, event, end, &iwe, (char *)ie);
break;
}
}
@@ -1001,7 +1001,7 @@
if (ie_is_wpa_ie(((uint8 **)&ie), &ptr, &ptr_len)) {
iwe.cmd = IWEVGENIE;
iwe.u.data.length = ie->len + 2;
- event = iwe_stream_add_point(event, end, &iwe, (char *)ie);
+ event = iwe_stream_add_point(info, event, end, &iwe, (char *)ie);
goto done;
}
}
@@ -1015,7 +1015,7 @@
else
iwe.u.data.flags = IW_ENCODE_DISABLED;
iwe.u.data.length = 0;
- event = iwe_stream_add_point(event, end, &iwe, (char *)event);
+ event = iwe_stream_add_point(info, event, end, &iwe, (char *)event);
if (bi->rateset.count) {
value = event + IW_EV_LCP_LEN;
@@ -1024,7 +1024,7 @@
iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
for (j = 0; j < bi->rateset.count && j < IW_MAX_BITRATES; j++) {
iwe.u.bitrate.value = (bi->rateset.rates[j] & 0x7f) * 500000;
- value = iwe_stream_add_value(event, value, end, &iwe,
+ value = iwe_stream_add_value(info, event, value, end, &iwe,
IW_EV_PARAM_LEN);
}
event = value;
broadcom-wl-5.10.27.11-vlanmode.patch:
--- NEW FILE broadcom-wl-5.10.27.11-vlanmode.patch ---
diff -Naur broadcom-wl.old/src/wl/sys/wl_iw.c broadcom-wl/src/wl/sys/wl_iw.c
--- broadcom-wl.old/src/wl/sys/wl_iw.c 2008-12-22 14:08:06.000000000 +0000
+++ broadcom-wl/src/wl/sys/wl_iw.c 2008-12-22 14:11:18.000000000 +0000
@@ -124,7 +124,7 @@
return ret;
}
-static int
+int
dev_wlc_intvar_set(
struct net_device *dev,
char *name,
diff -Naur broadcom-wl.old/src/wl/sys/wl_linux.c broadcom-wl/src/wl/sys/wl_linux.c
--- broadcom-wl.old/src/wl/sys/wl_linux.c 2008-12-05 19:46:08.000000000 +0000
+++ broadcom-wl/src/wl/sys/wl_linux.c 2008-12-22 14:17:13.000000000 +0000
@@ -246,6 +246,8 @@
};
MODULE_DEVICE_TABLE(pci, wl_id_table);
+MODULE_LICENSE("MIXED/Proprietary");
+
#ifdef BCMDBG
static int msglevel = 0xdeadbeef;
module_param(msglevel, int, 0);
@@ -288,6 +290,8 @@
#endif
#endif
}
+
+extern int dev_wlc_intvar_set(struct net_device *dev, char *name, int val);
static wl_info_t *
wl_attach(uint16 vendor, uint16 device, ulong regs, uint bustype, void *btparam, uint irq)
@@ -439,6 +443,9 @@
printf("%s: Broadcom BCM%04x 802.11 Wireless Controller " EPI_VERSION_STR,
dev->name, device);
+ /* Work around. Default vlan_mode to off */
+ wlc_iovar_setint(wl->wlc, "vlan_mode", OFF);
+
#ifdef BCMDBG
printf(" (Compiled in " SRCBASE " at " __TIME__ " on " __DATE__ ")");
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2008 11:50:31 -0000 1.2
+++ .cvsignore 31 Dec 2008 14:41:34 -0000 1.3
@@ -1,2 +1,2 @@
-hybrid-portsrc-x86_32_5_10_27_6.tar.gz
-hybrid-portsrc-x86_64_5_10_27_6.tar.gz
+hybrid-portsrc-x86-32_5_10_27_11.tar.gz
+hybrid-portsrc-x86-64_5_10_27_11.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2008 11:50:31 -0000 1.2
+++ sources 31 Dec 2008 14:41:34 -0000 1.3
@@ -1,2 +1,2 @@
-7f50d89179e637225bd97022b323c27e hybrid-portsrc-x86_32_5_10_27_6.tar.gz
-d61e5ad289fc5f0b62e0656f90b451a7 hybrid-portsrc-x86_64_5_10_27_6.tar.gz
+82c8f4312cf809fea2dcb175eb8e0036 hybrid-portsrc-x86-32_5_10_27_11.tar.gz
+78b403352902671252125d3fd00f8a22 hybrid-portsrc-x86-64_5_10_27_11.tar.gz
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-8/wl-kmod.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wl-kmod.spec 8 Nov 2008 17:52:10 -0000 1.4
+++ wl-kmod.spec 31 Dec 2008 14:41:34 -0000 1.5
@@ -3,20 +3,20 @@
# "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 newest
Name: wl-kmod
-Version: 5.10.27.6
-Release: 5%{?dist}
+Version: 5.10.27.11
+Release: 1%{?dist}
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32_5_10_27_6.ta...
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64_5_10_27_6.ta...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86-32_5_10_27_11.t...
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86-64_5_10_27_11.t...
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.10.27.6-kernel-2.6.27.patch
-Patch1: broadcom-wl-5.10.27.6-vlanmode.patch
+Patch0: broadcom-wl-5.10.27.11-kernel-2.6.27.patch
+Patch1: broadcom-wl-5.10.27.11-vlanmode.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -84,6 +84,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
+- Update version to 5.10.27.11
+
* Sat Nov 08 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-5
- Fixed incorrect use of /usr/src/kernels/${kernel_version%%___*}
15 years, 10 months