diff -Nru bcmwl-6.30.223.141+bdcom/debian/changelog bcmwl-6.30.223.141+bdcom/debian/changelog --- bcmwl-6.30.223.141+bdcom/debian/changelog 2013-11-05 10:31:17.000000000 +0000 +++ bcmwl-6.30.223.141+bdcom/debian/changelog 2013-11-05 10:29:24.000000000 +0000 @@ -1,434 +1,6 @@ -bcmwl (6.30.223.141+bdcom-0ubuntu1) saucy; urgency=low +bcmwl (6.30.223.141+bdcom-1ppa1~saucy) saucy; urgency=low - * New upstream release: - - This is an official public release from Broadcom. - * debian/dkms.conf.in: - - Drop patches for kernels 3.4-3.9 (now upstream) - and keep only the one for 3.10. - * 0009-add-support-for-linux-3.10.0.patch: - - Refresh for the latest upstream release. + * Autobuild. - -- Alberto Milone Wed, 09 Oct 2013 16:24:16 +0200 + -- Vasiliy Tolstov Tue, 06 Aug 2013 07:52:30 +0400 -bcmwl (6.30.223.30+bdcom-0ubuntu3) saucy; urgency=low - - * debian/dkms.conf.in: - - Make sure 0009-add-support-for-linux-3.10.0.patch - is applied only against Linux 3.10. - - -- Alberto Milone Mon, 01 Jul 2013 15:22:30 +0200 - -bcmwl (6.30.223.30+bdcom-0ubuntu2) saucy; urgency=low - - * debian/dkms.conf.in, - debian/patches/0009-add-support-for-linux-3.10.0.patch: - - Add support for Linux 3.10. - Thanks to Maarten Lankhorst for the patch. - - -- Alberto Milone Tue, 18 Jun 2013 17:40:40 +0200 - -bcmwl (6.30.223.30+bdcom-0ubuntu1) saucy; urgency=low - - * New upstream release. - * debian/dkms.conf.in: - - Drop patches for Linux 3.2 and 3.4. - * 0006-add-support-for-linux-3.8.0.patch, - 0007-nl80211-move-scan-API-to-wdev.patch: - - Refresh against new release. - * 0008-add-support-for-linux-3.9.0.patch: - - Add support for Linux 3.9 (LP: #1157880). - - -- Alberto Milone Wed, 15 May 2013 13:11:43 +0200 - -bcmwl (6.20.155.1+bdcom-0ubuntu6) raring; urgency=low - - * debian/control: - - Drop all the dependencies on the linux-headers. - - -- Alberto Milone Thu, 17 Jan 2013 16:31:46 +0100 - -bcmwl (6.20.155.1+bdcom-0ubuntu5) raring; urgency=low - - * 0007-nl80211-move-scan-API-to-wdev.patch: - - Move scan API to wdev. This fixes an issue with - Linux >= 3.6 (LP: #1098225). - Thanks to Robert Hooker for suggesting the patch. - - -- Alberto Milone Thu, 10 Jan 2013 18:09:48 +0100 - -bcmwl (6.20.155.1+bdcom-0ubuntu4) raring; urgency=low - - * 0006-add-support-for-linux-3.8.0.patch: - - Make sure to pass the correct argument to wl_ch_to_chanspec - according to the kernel (LP: #1097729). - - -- Alberto Milone Wed, 09 Jan 2013 15:28:26 +0100 - -bcmwl (6.20.155.1+bdcom-0ubuntu3) raring; urgency=low - - * 0006-add-support-for-linux-3.8.0.patch: - - Add support for Linux 3.8 (LP: #1095751). - - -- Alberto Milone Tue, 08 Jan 2013 15:13:17 +0100 - -bcmwl (6.20.155.1+bdcom-0ubuntu2) raring; urgency=low - - * Drop parsing of src/src/wl/sys/wl_linux.c, as the current upstream version - dropped all useful vendor matches in its pci_device_id struct and now has - a broken modalias. Keep a static debian/bcmwl-kernel-source.modaliases - instead which matches on any Broadcom network device (vendor 14E4 class 02 - subclass 80). This brings back a proper "Modaliases:" package header. - (LP: #1089943) - - -- Martin Pitt Thu, 13 Dec 2012 16:02:24 +0100 - -bcmwl (6.20.155.1+bdcom-0ubuntu1) raring; urgency=low - - * New upstream release (LP: #923809): - - Added 43142 support. - - Added 4331 support. - * debian/control: - - depend on the different flavours of the linux-headers. - * Refresh 0002-Makefile.patch and 0001-MODULE_LICENSE.patch. - - -- Alberto Milone Tue, 11 Dec 2012 17:06:22 +0100 - -bcmwl (5.100.82.112+bdcom-0ubuntu4) raring; urgency=low - - * debian/bcmwl-kernel-source.postinst: Silence the errors from rmmod about - the modules not being loaded. This is fully expected, and just causes - confusion, as well as autopkgtest failures. - - -- Martin Pitt Wed, 07 Nov 2012 14:54:27 +0100 - -bcmwl (5.100.82.112+bdcom-0ubuntu3) quantal; urgency=low - - * debian/bcmwl-kernel-source.postinst: Mirror the actions of the installed - modprobe.d files, i. e. rmmod the b43 driver and try to modprobe wl, so - that this package works right after installation. (LP: #1065827) - * debian/bcmwl-kernel-source.postinst: Drop duplicate #DEBHELPER# token. It - does not currently expand to anything, but it looks confusing. - - -- Martin Pitt Fri, 12 Oct 2012 14:00:38 +0200 - -bcmwl (5.100.82.112+bdcom-0ubuntu2) quantal; urgency=low - - * 0004-Add-support-for-Linux-3.2.patch: - - Make sure the patch can always be applied. - * debian/dkms.conf.in: - - Always apply all patches (LP: #1020059). - - -- Alberto Milone Thu, 05 Jul 2012 13:20:00 +0200 - -bcmwl (5.100.82.112+bdcom-0ubuntu1) quantal; urgency=low - - * New upstream release: - - Add Monitor mode. - - Add cfg80211 API support. The choice of API is - done at compile time. If kernel version >= 2.6.32, - cfg80211 is used, otherwise wireless extension - is used. (End users should notice little - difference.) - - Fix problem with triggered a reboot when the - wireless was disabled using the function key. - - Fix a kernel panic observed on some 64-bit - systems. - - -- Alberto Milone Wed, 20 Jun 2012 13:30:20 +0200 - -bcmwl (5.100.82.38+bdcom-0ubuntu8) quantal; urgency=low - - * debian/dkms.conf.in: - - Make sure to apply 0005-add-support-for-linux-3.4.0.patch. - - -- Alberto Milone Mon, 18 Jun 2012 12:03:31 +0200 - -bcmwl (5.100.82.38+bdcom-0ubuntu7) quantal; urgency=low - - * Add 0005-Add-support-for-Linux-3.4.0.patch: - - Thanks to Eugene San for the patch (LP: #994255). - * debian/dkms.conf.in: - - Make sure that both patch 0004 and 0005 are applied - when dealing with linux 3.4. - - -- Alberto Milone Tue, 22 May 2012 13:10:38 +0200 - -bcmwl (5.100.82.38+bdcom-0ubuntu6.1) precise-proposed; urgency=low - - * debian/bcmwl-kernel-source.postinst: - - Blacklist brcmfmac, brcmsmac and bcma so that they don't - conflict with the closed driver (LP: #873117) - - -- Alberto Milone Mon, 23 Apr 2012 16:11:56 +0200 - -bcmwl (5.100.82.38+bdcom-0ubuntu6) precise; urgency=high - - * Update to match switch to PAE kernel by default in precise for i386 - (LP: #986475) - - Depend on linux-headers-generic-pae on i386 instead of - linux-headers-generic so that the right headers are available to build - the driver - * Drop long obsolete lpia specific depends on linux-headers-lpia - - -- Scott Kitterman Sat, 21 Apr 2012 02:09:32 -0400 - -bcmwl (5.100.82.38+bdcom-0ubuntu5) precise; urgency=low - - * Add 0004-Add-support-for-Linux-3.2.patch. - - -- Alberto Milone Tue, 22 Nov 2011 18:48:03 +0100 - -bcmwl (5.100.82.38+bdcom-0ubuntu4) oneiric; urgency=low - - [ Daniel van Vugt ] - * debian/bcmwl-kernel-source.prerm: - - Don't error out if we can't remove bcmwl module. LP: #776439 - * debian/bcmwl-kernel-source.postinst: - - Unconditionally update the blacklist (i.e. even on upgrade). - LP: #776165 - - -- Michael Terry Wed, 01 Jun 2011 13:57:27 -0400 - -bcmwl (5.100.82.38+bdcom-0ubuntu3) natty; urgency=low - - * debian/bcmwl-kernel-source.postinst: Also blacklist brcm80211, to ensure - it actually is getting used. Thanks to Daniel van Vugt for the patch! - (LP: #747002) - - -- Martin Pitt Mon, 18 Apr 2011 12:14:43 +0200 - -bcmwl (5.100.82.38+bdcom-0ubuntu2) natty; urgency=low - - [ Henrik Rydberg ] - * debian/patches0003-Make-up-for-missing-init_MUTEX.patch: - - Make up for missing init_MUTEX (LP: #700176). - - -- Alberto Milone Mon, 10 Jan 2011 11:51:03 +0100 - -bcmwl (5.100.82.38+bdcom-0ubuntu1) natty; urgency=low - - * debian/control: - - Update the description. - * New upstream release: - - Add support for bcm43227 and bcm43228. - - Fix issue where iwconfig was sometimes reporting rate incorrectly. - - Add support for rfkill in kernels 2.6.31 to 2.6.36. - - Add support for scan complete event (SIOCGIWSCAN). - - Add EAGAIN (busy signal) to query of scan results. - - 4313 PHY fixes to improve throughput stability at different ranges. - - Fix interop issues with different APs. - - Fix hangs seen during Fn-F2 sequence. - - -- Alberto Milone Wed, 05 Jan 2011 16:56:18 +0100 - -bcmwl (5.60.246.2+bdcom-0ubuntu3) natty; urgency=low - - * debian/rules: Fix cleaning to not fall over on the buildds. - - -- Martin Pitt Thu, 25 Nov 2010 23:01:51 +0100 - -bcmwl (5.60.246.2+bdcom-0ubuntu2) natty; urgency=low - - * debian/control: Drop Vcs-Bzr:, that old branch is severely out of date. - Using lp:ubuntu/bcmwl now. - * debian/rules: Convert to dh 7. Bump debhelper compat level to 7 for that, - and drop cdbs dependency. - * debian/copyright: Point to versioned GPL license. - * debian/bcmwl-kernel-source.{postinst,postrm,prerm}: Add missing "set -e". - * debian/bcmwl-kernel-source.{postinst,postrm}: Call update-initramfs - without explicit path. - * debian/control: Fix spelling error. - * debian/control: Drop obsolete "lpia" architecture. - * debian/control: Bump Standards-Version to 3.9.1. - * Move from separate modalias file package to using a package header: - - debian/control, debian/rules, debian/bcmwl-modaliases.install.in: Drop - bcmwl-modaliases package. - - debian/rules: Build --with modaliases, to invoke dh_modaliases. Build - the modalias list to debian/bcmwl-kernel-source.modaliases, where - dh_modaliases picks it up. - - debian/control: Add XB-Modaliases header. - - debian/control: Add Conflicts:/Replaces: bcmwl-modaliases, so that the - obsolete modaliases package gets cleaned up on upgrades. - - -- Martin Pitt Thu, 25 Nov 2010 20:13:43 +0100 - -bcmwl (5.60.246.2+bdcom-0ubuntu1) natty; urgency=low - - * Remove 0003-autoconf.h.patch as it's no longer needed. - * Remove 0004-mclist.patch as it's no longer needed. - * New upstream release: - - Add support for kernels up to 2.6.36. - - Prevent the system from hanging when using the F2 hot key to - enable/disable wireless quickly while wireless is still in the - process of re-association with AP (LP: #611575). - - -- Alberto Milone Thu, 21 Oct 2010 13:25:16 +0200 - -bcmwl (5.60.48.36+bdcom-0ubuntu5) maverick; urgency=low - - * debian/patches/0004-mclist.patch: - - Switch over to multicast iterator functions for kernels v2.6.35 and - later. This fixes module building on v2.6.35-1.1. Conditionalise - the patch to support older kernels. (LP: #590924) - - -- Andy Whitcroft Tue, 08 Jun 2010 11:19:05 +0100 - -bcmwl (5.60.48.36+bdcom-0ubuntu4) maverick; urgency=low - - * debian/patches/0003-autoconf.h.patch: - - Do not #include in kernels that include it - automatically (2.6.15 or higher). This fixes building on 2.6.33 - which moved that file to . (LP: #580594) - - -- Anders Kaseorg Fri, 14 May 2010 21:23:45 -0400 - -bcmwl (5.60.48.36+bdcom-0ubuntu3) lucid; urgency=low - - * Fix control file to support -generic-pae kernel install (LP: #567607) - - -- Jerone Young Tue, 20 Apr 2010 18:44:53 -0500 - -bcmwl (5.60.48.36+bdcom-0ubuntu2) lucid; urgency=low - - * debian/bcmwl-kernel-source.postinst: - - Do not exit after using DKMS if there are no errors. - - -- Alberto Milone Mon, 15 Feb 2010 15:57:31 +0100 - -bcmwl (5.60.48.36+bdcom-0ubuntu1) lucid; urgency=low - - * New upstream release (LP: #432780): - - Support up to linux kernel 2.6.31. 2.6.32 support is there - also but not tested (although reports from users suggests it - works fine). - - Support for hidden networks. - - Support for rfkill in kernels < 2.6.31. - - Setting power level via 'iwconfig eth1 txpower X' is now - operational - - Add support for 4313. - - Additional channels in both 2.4 and 5 Ghz bands. - - Fix issue with tkip group keys that caused the following - message to repeat often: - TKIP: RX tkey->key_idx=2 frame keyidx=1 priv=ffff8800cf80e840 - - Fix a continuous assoc/disassoc loop (in Ubuntu 8.04) - with suspend/resume with WPA2 and wpa_supplicant. - - Fix bug affecting Ubuntu 8.04 which prevented from pinging when - Linux STA is IBSS creator with WEP. - - Fix bug affecting Ubuntu 9.04 which prevented from connecting to - hidden networks after suspend/resume. - - Fix bug which prevented the driver from associating to AP with - when transitioning from AES to TKIP encryption. - * debian/patches/0002-Makefile.patch: - - Refresh patch. - * debian/patches/0003-DEV_WL_IF.patch, - 0004-broadcom-sta-5.10.91.9-linux-2.6.30.patch, - 0005-NET_DEVICE_OPS.patch, - 0006-broadcom-sta-5.10.91.9-linux-2.6.32.patch: - - Drop patches as they are now part of the upstream code. - * debian/dkms.conf.in: - - Remove the lines about the above mentioned patches. - * debian/bcmwl-kernel-source.postinst: - - Make use of /usr/lib/dkms/common.postinst (LP: #497149). - * Bump compat to 5. - - -- Alberto Milone Sun, 14 Feb 2010 19:58:58 +0100 - -bcmwl (5.10.91.9+bdcom-0ubuntu5) lucid; urgency=low - - [ Michael Casadevall ] - * debian/patches/0006-broadcom-sta-5.10.91.9-linux-2.6.32.patch: - - Fix the build for 2.6.32-HEAD (LP: #458757) - - [ Alberto Milone ] - * debian/dkms.conf.in: - - Make sure that Michael's patch is applied only for 2.6.32 - kernels. - - -- Alberto Milone Wed, 18 Nov 2009 12:48:41 +0100 - -bcmwl (5.10.91.9+bdcom-0ubuntu4) karmic; urgency=low - - * debian/patches/0005-NET_DEVICE_OPS.patch: - - Don’t break build for <= 2.6.30. (LP: #394279) - - -- Anders Kaseorg Wed, 01 Jul 2009 11:05:25 -0400 - -bcmwl (5.10.91.9+bdcom-0ubuntu3) karmic; urgency=low - - * Update for new net_device_ops API (fixes build for 2.6.31). - - -- Soren Hansen Tue, 30 Jun 2009 22:55:18 -0700 - -bcmwl (5.10.91.9+bdcom-0ubuntu2) karmic; urgency=low - - * debian/rules, debian/bcmwl-kernel-source.install.in: - - Install only the binary compiled for the target - architecture. - - -- Alberto Milone Fri, 19 Jun 2009 19:19:02 +0200 - -bcmwl (5.10.91.9+bdcom-0ubuntu1) karmic; urgency=low - - * debian/control: - - Add misc:Depends. - - Update Standards-Version. - - Depend on linux-headers-generic for i386 and amd64 - and on linux-headers-lpia for lpia. - - Limit architectures to i386 amd64 and lpia. - - Set Vcs-Bzr. - - Add new package bcmwl-modaliases. - - Change maintainer to Ubuntu Core Devs and set - original maintainer to myself. - * debian/copyright: - - Add license from the binary library. - * debian/rules - - Switch to CDBS. - - Do not apply any patches. - - Automatically generate debian/dkms.conf and - debian/bcmwl-kernel-source.install. - - Call debian/bcmwl_supported to install - modalias file in /usr/share/jockey/modaliases (LP: #381682) - * src/patches: - - Move patches directory to debian/patches. - * debian/patches/0002-Makefile.patch: - - Replace dpkg-architecture with dpkg --print-architecture - so as not to depend on dpkg-dev. - * debian/dkms.conf.in: - - Handle patches here so that different patches - can be applied to different kernel versions. - * Separate source from debian/. - * debian/bcmwl-kernel-source.postinst: - - Cover the use case of buildd machines and build the - module for the right kernel on 1st installation. - - Create a blacklist file containing b43, b43legacy, ssb - bcm43xx and add workaround for b44 so that it is loaded - after wl (provided that b44 is used). - - Update initramfs. - * debian/bcmwl-kernel-source.postrm: - - Remove blacklist file. - - Update initramfs. - * debian/patches: - - Add 0004-broadcom-sta-5.10.91.9-linux-2.6.30.patch. - * debian/dkms.conf.in: - - Make sure that patch 0004 is applied only to - 2.6.30 kernels. - - -- Alberto Milone Fri, 19 Jun 2009 13:12:39 +0200 - -bcmwl (5.10.91.9-3) karmic; urgency=low - - * Fixed build errors with 2.6.30 - - -- Tim Gardner Tue, 12 May 2009 15:29:06 -0600 - -bcmwl (5.10.91.9-2) karmic; urgency=low - - * Add src/lib/LICENSE.txt to copyright notice. - - -- Tim Gardner Mon, 11 May 2009 16:04:29 +0000 - -bcmwl (5.10.91.9-1) karmic; urgency=low - - * Initial release - - -- Tim Gardner Fri, 5 Sep 2008 18:15:32 -0400 diff -Nru bcmwl-6.30.223.141+bdcom/debian/dkms.conf.in bcmwl-6.30.223.141+bdcom/debian/dkms.conf.in --- bcmwl-6.30.223.141+bdcom/debian/dkms.conf.in 2013-11-05 10:31:17.000000000 +0000 +++ bcmwl-6.30.223.141+bdcom/debian/dkms.conf.in 2013-11-05 10:29:19.000000000 +0000 @@ -8,6 +8,10 @@ PATCH[0]="0001-MODULE_LICENSE.patch" PATCH[1]="0002-Makefile.patch" PATCH[2]="0003-Make-up-for-missing-init_MUTEX.patch" -PATCH[3]="0009-add-support-for-linux-3.10.0.patch" -#PATCH_MATCH[6]="^3.[10-11]" +PATCH[3]="0006-add-support-for-linux-3.8.0.patch" +PATCH[4]="0007-nl80211-move-scan-API-to-wdev.patch" +PATCH[5]="0008-add-support-for-linux-3.9.0.patch" +PATCH[6]="0009-add-support-for-linux-3.10.0.patch" +#PATCH_MATCH[3]="^3.[23456]" +PATCH_MATCH[6]="^3.[10-11]" AUTOINSTALL="yes" diff -Nru bcmwl-6.30.223.141+bdcom/debian/patches/0009-add-support-for-linux-3.10.0.patch bcmwl-6.30.223.141+bdcom/debian/patches/0009-add-support-for-linux-3.10.0.patch --- bcmwl-6.30.223.141+bdcom/debian/patches/0009-add-support-for-linux-3.10.0.patch 2013-11-05 10:31:17.000000000 +0000 +++ bcmwl-6.30.223.141+bdcom/debian/patches/0009-add-support-for-linux-3.10.0.patch 2013-11-05 10:29:19.000000000 +0000 @@ -1,18 +1,7 @@ -From 53c81dd6a3ad5919aef8c25f0589d8a538ddb532 Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Wed, 9 Oct 2013 12:46:52 +0200 -Subject: [PATCH 1/1] Add support for Linux 3.10 - -Thanks to Maarten Lankhorst for the patch. ---- - src/wl/sys/wl_linux.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 77 insertions(+), 5 deletions(-) - -diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c -index 521f02e..3ead3c3 100644 ---- a/src/wl/sys/wl_linux.c -+++ b/src/wl/sys/wl_linux.c -@@ -3235,7 +3235,7 @@ wl_tkip_keyset(wl_info_t *wl, wsec_key_t *key) +diff -ru build.3.9/src/wl/sys/wl_linux.c build/src/wl/sys/wl_linux.c +--- build.3.9/src/wl/sys/wl_linux.c 2013-06-18 13:48:04.109167642 +0000 ++++ build/src/wl/sys/wl_linux.c 2013-06-18 14:24:33.448198331 +0000 +@@ -3236,7 +3236,7 @@ void wl_tkip_printstats(wl_info_t *wl, bool group_key) { @@ -21,7 +10,7 @@ char debug_buf[512]; int idx; if (wl->tkipmodops) { -@@ -3408,6 +3408,7 @@ wl_linux_watchdog(void *ctx) +@@ -3409,6 +3409,7 @@ return 0; } @@ -29,7 +18,7 @@ static int wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data) { -@@ -3462,19 +3463,90 @@ wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *d +@@ -3463,19 +3464,90 @@ return length; } @@ -109,7 +98,7 @@ + wl->proc_entry->read_proc = wl_proc_read; + wl->proc_entry->write_proc = wl_proc_write; + wl->proc_entry->data = wl; -+ } ++ } +#else + wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_proc_fops, wl); +#endif @@ -124,6 +113,3 @@ return 0; } #ifdef WLOFFLD --- -1.7.9.5 - Binary files /tmp/50H9ea0P1_/bcmwl-6.30.223.141+bdcom/src/lib/wlc_hybrid.o_shipped_i386 and /tmp/UGzH63xsq0/bcmwl-6.30.223.141+bdcom/src/lib/wlc_hybrid.o_shipped_i386 differ Binary files /tmp/50H9ea0P1_/bcmwl-6.30.223.141+bdcom/src/lib/wlc_hybrid.o_shipped_x86_64 and /tmp/UGzH63xsq0/bcmwl-6.30.223.141+bdcom/src/lib/wlc_hybrid.o_shipped_x86_64 differ diff -Nru bcmwl-6.30.223.141+bdcom/src/src/common/include/proto/802.11.h bcmwl-6.30.223.141+bdcom/src/src/common/include/proto/802.11.h --- bcmwl-6.30.223.141+bdcom/src/src/common/include/proto/802.11.h 2013-08-01 06:52:22.000000000 +0000 +++ bcmwl-6.30.223.141+bdcom/src/src/common/include/proto/802.11.h 2013-11-05 10:29:19.000000000 +0000 @@ -15,7 +15,7 @@ * * Fundamental types and constants relating to 802.11 * - * $Id: 802.11.h 394280 2013-04-01 23:04:24Z $ + * $Id: 802.11.h 384190 2013-02-09 04:34:23Z $ */ #ifndef _802_11_H_ @@ -1235,7 +1235,6 @@ #define DOT11_PUB_ACTION_BSS_COEX_MNG 0 #define DOT11_PUB_ACTION_CHANNEL_SWITCH 4 -#define DOT11_PUB_ACTION_GAS_CB_REQ 12 #define DOT11_BA_ACTION_ADDBA_REQ 0 #define DOT11_BA_ACTION_ADDBA_RESP 1 diff -Nru bcmwl-6.30.223.141+bdcom/src/src/include/bcmutils.h bcmwl-6.30.223.141+bdcom/src/src/include/bcmutils.h --- bcmwl-6.30.223.141+bdcom/src/src/include/bcmutils.h 2013-08-01 06:52:22.000000000 +0000 +++ bcmwl-6.30.223.141+bdcom/src/src/include/bcmutils.h 2013-11-05 10:29:19.000000000 +0000 @@ -15,7 +15,7 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: bcmutils.h 410746 2013-07-02 23:56:47Z $ + * $Id: bcmutils.h 382794 2013-02-04 17:34:08Z $ */ #ifndef _bcmutils_h_ @@ -24,7 +24,6 @@ #define bcm_strcpy_s(dst, noOfElements, src) strcpy((dst), (src)) #define bcm_strncpy_s(dst, noOfElements, src, count) strncpy((dst), (src), (count)) #define bcm_strcat_s(dst, noOfElements, src) strcat((dst), (src)) -#define bcm_sprintf_s snprintf #define _BCM_U 0x01 #define _BCM_L 0x02 diff -Nru bcmwl-6.30.223.141+bdcom/src/src/include/epivers.h bcmwl-6.30.223.141+bdcom/src/src/include/epivers.h --- bcmwl-6.30.223.141+bdcom/src/src/include/epivers.h 2013-08-01 06:52:22.000000000 +0000 +++ bcmwl-6.30.223.141+bdcom/src/src/include/epivers.h 2013-11-05 10:29:19.000000000 +0000 @@ -26,16 +26,16 @@ #define EPI_RC_NUMBER 223 -#define EPI_INCREMENTAL_NUMBER 141 +#define EPI_INCREMENTAL_NUMBER 30 #define EPI_BUILD_NUMBER 0 -#define EPI_VERSION 6, 30, 223, 141 +#define EPI_VERSION 6, 30, 223, 30 -#define EPI_VERSION_NUM 0x061edf8d +#define EPI_VERSION_NUM 0x061edf1e #define EPI_VERSION_DEV 6.30.223 -#define EPI_VERSION_STR "6.30.223.141 (r415941)" +#define EPI_VERSION_STR "6.30.223.30 (r390414)" #endif diff -Nru bcmwl-6.30.223.141+bdcom/src/src/include/packed_section_end.h bcmwl-6.30.223.141+bdcom/src/src/include/packed_section_end.h --- bcmwl-6.30.223.141+bdcom/src/src/include/packed_section_end.h 2013-08-01 06:52:22.000000000 +0000 +++ bcmwl-6.30.223.141+bdcom/src/src/include/packed_section_end.h 2013-11-05 10:29:19.000000000 +0000 @@ -28,7 +28,7 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * $Id: packed_section_end.h 395414 2013-04-07 19:26:09Z $ + * $Id: packed_section_end.h 241182 2011-02-17 21:50:03Z $ */ #ifdef BWL_PACKED_SECTION diff -Nru bcmwl-6.30.223.141+bdcom/src/src/include/packed_section_start.h bcmwl-6.30.223.141+bdcom/src/src/include/packed_section_start.h --- bcmwl-6.30.223.141+bdcom/src/src/include/packed_section_start.h 2013-08-01 06:52:22.000000000 +0000 +++ bcmwl-6.30.223.141+bdcom/src/src/include/packed_section_start.h 2013-11-05 10:29:19.000000000 +0000 @@ -28,7 +28,7 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * $Id: packed_section_start.h 395414 2013-04-07 19:26:09Z $ + * $Id: packed_section_start.h 286783 2011-09-29 06:18:57Z $ */ #ifdef BWL_PACKED_SECTION diff -Nru bcmwl-6.30.223.141+bdcom/src/src/include/pcicfg.h bcmwl-6.30.223.141+bdcom/src/src/include/pcicfg.h --- bcmwl-6.30.223.141+bdcom/src/src/include/pcicfg.h 2013-08-01 06:52:22.000000000 +0000 +++ bcmwl-6.30.223.141+bdcom/src/src/include/pcicfg.h 2013-11-05 10:29:19.000000000 +0000 @@ -15,7 +15,7 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: pcicfg.h 392809 2013-03-24 22:49:08Z $ + * $Id: pcicfg.h 316716 2012-02-23 04:39:13Z $ */ #ifndef _h_pcicfg_ diff -Nru bcmwl-6.30.223.141+bdcom/src/src/include/wlioctl.h bcmwl-6.30.223.141+bdcom/src/src/include/wlioctl.h --- bcmwl-6.30.223.141+bdcom/src/src/include/wlioctl.h 2013-08-01 06:52:22.000000000 +0000 +++ bcmwl-6.30.223.141+bdcom/src/src/include/wlioctl.h 2013-11-05 10:29:19.000000000 +0000 @@ -18,7 +18,7 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: wlioctl.h 415531 2013-07-30 18:39:00Z $ + * $Id: wlioctl.h 389108 2013-03-05 17:49:56Z $ */ #ifndef _wlioctl_h_ @@ -504,10 +504,8 @@ #define PM_FORCE_OFF 3 #define NFIFO 6 -#define NREINITREASONCOUNT 8 -#define REINITREASONIDX(_x) (((_x) < NREINITREASONCOUNT) ? (_x) : 0) -#define WL_CNT_T_VERSION 10 +#define WL_CNT_T_VERSION 8 typedef struct { uint16 version; @@ -720,9 +718,6 @@ uint32 unchained; uint32 maxchainsz; uint32 currchainsz; - uint32 pciereset; - uint32 cfgrestore; - uint32 reinitreason[NREINITREASONCOUNT]; } wl_cnt_t; #define WL_WME_CNT_VERSION 1 diff -Nru bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wl_cfg80211_hybrid.c bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wl_cfg80211_hybrid.c --- bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wl_cfg80211_hybrid.c 2013-08-01 06:52:22.000000000 +0000 +++ bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wl_cfg80211_hybrid.c 2013-11-05 10:29:19.000000000 +0000 @@ -47,14 +47,8 @@ static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, enum nl80211_iftype type, u32 *flags, struct vif_params *params); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) -static s32 -wl_cfg80211_scan(struct wiphy *wiphy, - struct cfg80211_scan_request *request); -#else static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_scan_request *request); -#endif 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, struct cfg80211_ibss_params *params); @@ -67,11 +61,7 @@ struct cfg80211_connect_params *sme); static s32 wl_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_code); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) -static s32 -wl_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, - enum nl80211_tx_power_setting type, s32 dbm); -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) static s32 wl_cfg80211_set_tx_power(struct wiphy *wiphy, enum nl80211_tx_power_setting type, s32 dbm); #else @@ -79,11 +69,7 @@ enum tx_power_setting type, s32 dbm); #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) -static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, s32 *dbm); -#else static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm); -#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, @@ -496,21 +482,10 @@ return 0; } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) -static s32 -wl_cfg80211_scan(struct wiphy *wiphy, - struct cfg80211_scan_request *request) -#else static s32 -wl_cfg80211_scan(struct wiphy *wiphy, - struct net_device *ndev, +wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_scan_request *request) -#endif - { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) - struct net_device *ndev = request->wdev->netdev; -#endif struct wl_cfg80211_priv *wl = ndev_to_wl(ndev); struct cfg80211_ssid *ssids; struct wl_cfg80211_scan_req *sr = wl_to_sr(wl); @@ -720,11 +695,8 @@ else memset(&join_params.params.bssid, 0, ETHER_ADDR_LEN); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) - wl_ch_to_chanspec(params->chandef.chan, &join_params, &join_params_size); -#else wl_ch_to_chanspec(params->channel, &join_params, &join_params_size); -#endif + err = wl_dev_ioctl(dev, WLC_SET_SSID, &join_params, join_params_size); if (err) { WL_ERR(("Error (%d)\n", err)); @@ -1077,11 +1049,7 @@ return err; } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) -static s32 -wl_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, - enum nl80211_tx_power_setting type, s32 dbm) -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) static s32 wl_cfg80211_set_tx_power(struct wiphy *wiphy, enum nl80211_tx_power_setting type, s32 dbm) #else @@ -1138,11 +1106,7 @@ return err; } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) -static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, s32 *dbm) -#else static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm) -#endif { struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy); struct net_device *ndev = wl_to_ndev(wl); @@ -1717,13 +1681,10 @@ struct wl_cfg80211_bss_info *notif_bss_info; struct wl_cfg80211_scan_req *sr = wl_to_sr(wl); struct beacon_proberesp *beacon_proberesp; - struct cfg80211_bss *cbss = NULL; s32 mgmt_type; u32 signal; u32 freq; s32 err = 0; - u8 *notify_ie; - size_t notify_ielen; if (dtoh32(bi->length) > WL_BSS_INFO_MAX) { WL_DBG(("Beacon is larger than buffer. Discarding\n")); @@ -1770,29 +1731,12 @@ mgmt->u.beacon.capab_info, &bi->BSSID)); signal = notif_bss_info->rssi * 100; - cbss = cfg80211_inform_bss_frame(wiphy, channel, mgmt, - le16_to_cpu(notif_bss_info->frame_len), signal, GFP_KERNEL); - if (unlikely(!cbss)) { + if (!cfg80211_inform_bss_frame(wiphy, channel, mgmt, + le16_to_cpu(notif_bss_info->frame_len), signal, GFP_KERNEL)) { WL_ERR(("cfg80211_inform_bss_frame error\n")); kfree(notif_bss_info); return -EINVAL; } - - notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); - notify_ielen = le32_to_cpu(bi->ie_length); - cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet), - 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, - (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); - - if (unlikely(!cbss)) - return -ENOMEM; - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) - cfg80211_put_bss(wiphy, cbss); -#else - cfg80211_put_bss(cbss); -#endif - kfree(notif_bss_info); return err; @@ -2000,9 +1944,6 @@ static s32 wl_update_bss_info(struct wl_cfg80211_priv *wl) { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) - struct wiphy *wiphy = wl_to_wiphy(wl); -#endif struct cfg80211_bss *bss; struct wl_bss_info *bi; struct wlc_ssid *ssid; @@ -2039,18 +1980,9 @@ ie_len = bi->ie_length; } else { WL_DBG(("Found the AP in the list - BSSID %pM\n", bss->bssid)); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) - ie = (u8 *)(bss->ies->data); - ie_len = bss->ies->len; -#else ie = bss->information_elements; ie_len = bss->len_information_elements; -#endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) - cfg80211_put_bss(wiphy, bss); -#else cfg80211_put_bss(bss); -#endif } tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM); diff -Nru bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wl_dbg.h bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wl_dbg.h --- bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wl_dbg.h 2013-08-01 06:52:22.000000000 +0000 +++ bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wl_dbg.h 2013-11-05 10:29:19.000000000 +0000 @@ -16,7 +16,7 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: wl_dbg.h 405851 2013-06-05 00:56:21Z $ + * $Id: wl_dbg.h 382794 2013-02-04 17:34:08Z $ */ #ifndef _wl_dbg_h_ @@ -36,10 +36,8 @@ #endif #if 0 && (VERSION_MAJOR > 9) -extern int osl_printf(const char *fmt, ...); #include -#define WL_PRINT(args) do { osl_printf args; } while (0) -#define RELEASE_PRINT(args) do { WL_PRINT(args); IO8Log args; } while (0) +#define WL_PRINT(args) do { printf args; IO8Log args; } while (0) #else #define WL_PRINT(args) do { WL_TIMESTAMP(); printf args; } while (0) #endif @@ -65,8 +63,7 @@ #define WL_APSTA_RX(args) #define WL_WSEC(args) #define WL_WSEC_DUMP(args) -#define WL_PCIE(args) do {if (wl_msg_level2 & WL_PCIE_VAL) WL_PRINT(args);} while (0) -#define WL_PCIE_ON() (wl_msg_level2 & WL_PCIE_VAL) + #endif extern uint32 wl_msg_level; diff -Nru bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wl_export.h bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wl_export.h --- bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wl_export.h 2013-08-01 06:52:22.000000000 +0000 +++ bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wl_export.h 2013-11-05 10:29:19.000000000 +0000 @@ -16,7 +16,7 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: wl_export.h 395432 2013-04-08 00:59:35Z $ + * $Id: wl_export.h 382794 2013-02-04 17:34:08Z $ */ #ifndef _wl_export_h_ @@ -41,8 +41,6 @@ extern void wl_reclaim(void); extern void wl_nocard_timer(void *arg); extern void wl_recover_nocard(struct wl_info *wl); -extern void wl_devicerecovery(struct wl_info *wl ); - #ifdef WLOFFLD extern uint32 wl_pcie_bar1(struct wl_info *wl, uchar** addr); #endif diff -Nru bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wl_linux.c bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wl_linux.c --- bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wl_linux.c 2013-08-01 06:52:22.000000000 +0000 +++ bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wl_linux.c 2013-11-05 10:29:19.000000000 +0000 @@ -16,7 +16,7 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: wl_linux.c 397462 2013-04-18 22:02:26Z $ + * $Id: wl_linux.c 383917 2013-02-08 03:35:28Z $ */ #define LINUX_PORT @@ -1979,17 +1979,9 @@ wl_sendup(wl_info_t *wl, wl_if_t *wlif, void *p, int numpkt) { struct sk_buff *skb; - bool brcm_specialpkt; WL_TRACE(("wl%d: wl_sendup: %d bytes\n", wl->pub->unit, PKTLEN(wl->osh, p))); - brcm_specialpkt = - (ntoh16_ua(PKTDATA(wl->pub->osh, p) + ETHER_TYPE_OFFSET) == ETHER_TYPE_BRCM); - - if (!brcm_specialpkt) { - - } - if (wlif) { if (!wlif->dev || !netif_device_present(wlif->dev)) { @@ -2008,8 +2000,7 @@ } skb->protocol = eth_type_trans(skb, skb->dev); - - if (!brcm_specialpkt && !ISALIGNED(skb->data, 4)) { + if (!ISALIGNED(skb->data, 4)) { WL_ERROR(("Unaligned assert. skb %p. skb->data %p.\n", skb, skb->data)); if (wlif) { WL_ERROR(("wl_sendup: dev name is %s (wlif) \n", wlif->dev->name)); diff -Nru bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wlc_pub.h bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wlc_pub.h --- bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wlc_pub.h 2013-08-01 06:52:22.000000000 +0000 +++ bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wlc_pub.h 2013-11-05 10:29:19.000000000 +0000 @@ -16,7 +16,7 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: wlc_pub.h 413887 2013-07-22 20:36:17Z $ + * $Id: wlc_pub.h 385085 2013-02-14 00:31:36Z $ */ #ifndef _wlc_pub_h_ @@ -48,11 +48,10 @@ #define WLC_80_MHZ 80 #define WLC_160_MHZ 160 -#define CHSPEC_WLC_BW(chanspec)(CHSPEC_IS160(chanspec) ? WLC_160_MHZ : \ - CHSPEC_IS80(chanspec) ? WLC_80_MHZ : \ - CHSPEC_IS40(chanspec) ? WLC_40_MHZ : \ - CHSPEC_IS20(chanspec) ? WLC_20_MHZ : \ - WLC_10_MHZ) +#define CHSPEC_WLC_BW(chanspec) (CHSPEC_IS80(chanspec) ? WLC_80_MHZ : \ + CHSPEC_IS40(chanspec) ? WLC_40_MHZ : \ + CHSPEC_IS20(chanspec) ? WLC_20_MHZ : \ + WLC_10_MHZ) #define WLC_RSSI_MINVAL -200 #define WLC_RSSI_NO_SIGNAL -91 @@ -474,15 +473,6 @@ uint32 rxnobuf; uint32 rxrunt; uint32 rxfragerr; - - uint32 txretry; - uint32 txretrie; - uint32 txfrmsnt; - uint32 txmulti; - uint32 txfrag; - - uint32 rxmulti; - } wlc_if_stats_t; #define WL_RXS_CRC_ERROR 0x00000001 @@ -701,12 +691,6 @@ extern wlc_pub_t *wlc_pub(void *wlc); -#if defined(BCMPCIDEV) || defined(WLOFFLD) - -extern void tcm_sem_enter(wlc_info_t *wlc); -extern void tcm_sem_exit(wlc_info_t *wlc); -#endif - extern int wlc_module_register(wlc_pub_t *pub, const bcm_iovar_t *iovars, const char *name, void *hdl, iovar_fn_t iovar_fn, watchdog_fn_t watchdog_fn, up_fn_t up_fn, down_fn_t down_fn); diff -Nru bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wlc_types.h bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wlc_types.h --- bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wlc_types.h 2013-08-01 06:52:22.000000000 +0000 +++ bcmwl-6.30.223.141+bdcom/src/src/wl/sys/wlc_types.h 2013-11-05 10:29:19.000000000 +0000 @@ -15,7 +15,7 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: wlc_types.h 402685 2013-05-16 17:47:20Z $ + * $Id: wlc_types.h 389424 2013-03-06 17:49:22Z $ */ #ifndef _wlc_types_h_ @@ -89,8 +89,6 @@ #ifdef WLOLPC typedef struct wlc_olpc_eng_info_t wlc_olpc_eng_info_t; #endif -typedef void(*wlc_stf_txchain_evt_notify)(wlc_info_t *wlc); - typedef struct wlc_11d_info wlc_11d_info_t; typedef struct wlc_cntry_info wlc_cntry_info_t; @@ -138,7 +136,6 @@ typedef struct wlc_dngl_ol_gtk_info wlc_dngl_ol_gtk_info_t; typedef struct wlc_dngl_ol_mdns_info wlc_dngl_ol_mdns_info_t; typedef struct wlc_dngl_ol_rssi_info wlc_dngl_ol_rssi_info_t; -typedef struct wlc_dngl_ol_eventlog_info wlc_dngl_ol_eventlog_info_t; #endif typedef struct wlc_nar_info wlc_nar_info_t;