2:59 p.m.
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;