Author: nvieville
Update of /cvs/nonfree/rpms/broadcom-wl/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13469
Modified Files:
.cvsignore README.txt broadcom-wl-blacklist.conf
broadcom-wl.spec sources
Added Files:
broadcom-wl-5.100.82.112-license.patch
Removed Files:
5_100_82_38.patch broadcom-wl-5.100.82.38-license.patch
Log Message:
* Wed Jan 11 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> -
5.100.82.112-1
- Updated version to 5.100.82.112
- Cleaned-up broadcom-wl-blacklist.conf
broadcom-wl-5.100.82.112-license.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-license.patch ---
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 2011-10-22
18:55:54.000000000 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c 2011-10-26
09:40:02.793032059 +0200
@@ -185,6 +185,8 @@
static void wl_report_radio_state(wl_info_t *wl);
#endif
+MODULE_LICENSE("MIXED/Proprietary");
+
static struct pci_device_id wl_id_table[] = {
{ PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 3 Nov 2011 23:41:40 -0000 1.10
+++ .cvsignore 11 Jan 2012 21:42:49 -0000 1.11
@@ -1,5 +1,4 @@
-hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
-hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
-README.txt
-bcma.txt
+hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
+hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
broadcom-wl-blacklist.conf
+README.txt
Index: README.txt
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/README.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README.txt 1 Feb 2011 22:29:12 -0000 1.3
+++ README.txt 11 Jan 2012 21:42:49 -0000 1.4
@@ -1,9 +1,10 @@
Broadcom Linux hybrid wireless driver
+Version 5.100.82.1XX
DISCLAIMER
----------
This is an Official Release of Broadcom's hybrid Linux driver for use with
-Broadcom-based hardware.
+Broadcom based hardware.
WHERE TO GET THE RELEASE
------------------------
@@ -38,32 +39,36 @@
SUPPORTED DEVICES
-----------------
The cards with the following PCI Device IDs are supported with this driver.
-Both Broadcom and and Dell product names are described. Cards not listed here
-may also work.
+Both Broadcom and and Dell product names are described. Cards not listed
+here may also work.
- BRCM PCI PCI Dell
- Product Name Vendor ID Device ID Product ID
- ------------- ---------- --------- -----------
+ BRCM PCI PCI Dell
+ Product Name Vendor ID Device ID Product ID
+ ------------- ---------- --------- -----------
4311 2.4 Ghz 0x14e4 0x4311 Dell 1390
4311 Dualband 0x14e4 0x4312 Dell 1490
- 4311 5 Ghz 0x14e4 0x4313
+ 4311 5 Ghz 0x14e4 0x4313
4312 2.4 Ghz 0x14e4 0x4315 Dell 1395
- 4313 2.4 Ghz 0x14e4 0x4727 Dell 1501
+ 4313 2.4 Ghz 0x14e4 0x4727 Dell 1501
4321 Dualband 0x14e4 0x4328 Dell 1505
4321 Dualband 0x14e4 0x4328 Dell 1500
4321 2.4 Ghz 0x14e4 0x4329
4321 5 Ghz 0x14e4 0x432a
- 4322 Dualband 0x14e4 0x432b Dell 1510
+ 4322 Dualband 0x14e4 0x432b Dell 1510
4322 2.4 Ghz 0x14e4 0x432c
4322 5 Ghz 0x14e4 0x432d
43224 Dualband 0x14e4 0x4353 Dell 1520
43225 2.4 Ghz 0x14e4 0x4357
- 43227 2.4 Ghz 0x14e4 0x4358
- 43228 Dualband 0x14e4 0x4359 Dell 1530
+ 43227 2.4 Ghz 0x14e4 0x4358
+ 43228 Dualband 0x14e4 0x4359 Dell 1530
To find the Device ID's of Broadcom cards on your machines do:
# lspci -n | grep 14e4
+NOTABLE CHANGES
+---------------
+ Added Cfg80211 support (described below)
+ Added Monitor mode (described below)
REQUIREMENTS
------------
@@ -73,7 +78,6 @@
package and varies from distro to distro. Consult the documentation for
your specific OS.
-
If you cannot successfully build a module that comes with your distro's
kernel developer or kernel source package, you will not be able to build
this module either.
@@ -102,13 +106,13 @@
------------------
1. Setup the directory by untarring the proper tarball:
-For 32 bit: hybrid-portsrc_x86-32_v5.100.82.38.tar.gz
-For 64 bit: hybrid-portsrc_x86-64_v5.100.82.38.tar.gz
+For 32 bit: hybrid-portsrc.tar.gz
+For 64 bit: hybrid-portsrc-x86_64.tar.gz
Example:
# mkdir hybrid_wl
# cd hybrid_wl
-# tar xzf <path>/hybrid-portsrc_x86-32_v5.100.82.38.tar.gz
+# tar xzf <path>/hybrid-portsrc.tar or <path>/hybrid-portsrc-x86_64.tar.gz
2. Build the driver as a Linux loadable kernel module (LKM):
@@ -121,6 +125,15 @@
If your driver does not build, check to make sure you have installed the
kernel package described in the requirements above.
+This driver now supports the new linux cfg80211 wireless configuration API in
+addition to the older Wireless Extensions (Wext). The makefile will
+automaticly build the right version for your system but it can be
+overridden if needed:
+
+# make API=WEXT
+ or
+# make API=CFG80211
+
INSTALL INSTRUCTIONS
--------------------
@@ -143,26 +156,28 @@
------------------
1: Remove any other drivers for the Broadcom wireless device.
-There are several open source drivers that are used to drive Broadcom 802.11
-chips such as b43 and ssb. They will conflict with this driver and need
-to be uninstalled before this driver can be installed. Any previous
-revisions of the wl driver also need to be removed.
+There are several other drivers (besides this one) that can drive
+Broadcom 802.11 chips such as b43, bcma and ssb. They will conflict with
+this driver and need to be uninstalled before this driver can be installed.
+Any previous revisions of the wl driver also need to be removed.
Note: On some systems such as Ubuntu 9.10, the ssb module may load during
boot even though it is blacklisted (see note under Common Issues on how to
-resolve this). Nevertheless, ssb still must be removed
+resolve this. Nevertheless, ssb still must be removed
(by hand or script) before wl is loaded. The wl driver will not function
properly if ssb the module is loaded.
-# lsmod | grep "b43\|ssb\|wl"
+# lsmod | grep "b43\|ssb\|bcma\|wl"
If any of these are installed, remove them:
# rmmod b43
# rmmod ssb
+# rmmod bcma
# rmmod wl
To blacklist these drivers and prevent them from loading in the future:
# echo "blacklist ssb" >> /etc/modprobe.d/blacklist.conf
+# echo "blacklist bcma" >> /etc/modprobe.d/blacklist.conf
# echo "blacklist b43" >> /etc/modprobe.d/blacklist.conf
2: Insmod the driver.
@@ -176,6 +191,11 @@
or
# modprobe ieee80211_crypt_tkip
+If your using the cfg80211 version of the driver, then cfg80211 needs to be
+loaded:
+
+# modprobe cfg80211
+
Then:
# insmod wl.ko
@@ -183,38 +203,42 @@
Manager to notice a new network driver has been installed and show the
surrounding wireless networks.
+If there was an error, see Common issues below.
+
Common issues:
----------------
-
* After the insmod you may see this message:
- "WARNING: modpost: missing MODULE_LICENSE()"
+ WARNING: modpost: missing MODULE_LICENSE()
It is expected, not harmful and can be ignored.
-* You might see this message:
+* If you see this message:
+
"insmod: error inserting 'wl.ko': -1 Unknown symbol in module"
- Usually this means that the wlan security module (as mentioned above) is
+
+ Usually this means that one of the required modules (as mentioned above) is
not loaded. Try this:
- # modprobe lib80211
- or
- # modprobe ieee80211_crypt_tkip
- and then re-try to insmod the wl driver.
+ # modprobe lib80211 or ieee80211_crypt_tkip (depending on your os)
+ # modprobe cfg80211
+
+ Now re-try to insmod the wl driver:
# insmod wl.ko
-
+
* If the wl driver loads but doesn't seem to do anything:
the ssb module may be the cause. Sometimes blacklisting ssb may not
be enough to prevent it from loading and it loads anyway. (This is mostly
seen on Ubuntu/Debian systems).
- Check to see if ssb, wl or b43 is loaded:
- # lsmod | grep "b43\|ssb\|wl"
+ Check to see if ssb, bcma, wl or b43 is loaded:
+ # lsmod | grep "ssb\|wl\|b43\|bcma"
If any of these are installed, remove them:
- # rmmod b43
# rmmod ssb
+ # rmmod bcma
# rmmod wl
+ # insmod wl
- Back up the current boot ramfs and generate a new one.
- # cp /boot/initrd.img-`uname -r` somewheresafe
+ Back up the current boot ramfs and generate a new one:
+ # cp /boot/initrd.img-`uname -r` somewheresafe
# update-initramfs -u
# reboot
@@ -248,65 +272,66 @@
Internally, the actual tx power is always kept within regulatory limits
no matter what the user request is set to.
-WHAT'S NEW IN RELEASE 5.100.82.38
----------------------------------
-+ Support for bcm43227 and bcm43228
-+ Fix for issue where iwconfig was sometime reporting rate incorrectly
-+ Supports rfkill in kernels 2.6.31 to 2.6.36
-+ Supports scan complete event (SIOCGIWSCAN)
-+ Adds EAGAIN (busy signal) to query of scan results
-WHAT'S NEW IN RELEASE 5.100.57.15
----------------------------------
-+ Following fixes (issues introduced in 5.100.57.13)
- Issue #87477 - 4313: DUT is not able to associate in WPA2-PSK TKIP/AES
- Issue #87533 - NetworkManager: 4313: Unable to associate to APs with WPA2-PSK
-
-WHAT'S NEW IN RELEASE 5.100.57.13
----------------------------------
-+ 4313 PHY fixes to improve throughput stability at different ranges
-+ Fix for interop issues with different APs
-+ Fix for hangs seen during Fn-F2 sequence
-- Support for rfkill in kernels 2.6.31 to 2.6.36
-
-WHAT'S NEW IN RELEASE 5.60.246.6
---------------------------------
-+ Supports rfkill in kernels 2.6.31 to 2.6.36
-+ Fix for compile error with multicast list in kernel 2.6.34
-+ Fix for #76743 - Ubuntu9.04: Network manager displays n/w's with radio disabled
-
-WHAT'S NEW IN RELEASE 5.60.246.2
---------------------------------
-+ Supports up to linux kernel 2.6.36 (from 2.6.32)
-+ Fix for #86668: [Canonical] Bug #611575/617369: System will hang if
- you use the F2 hot key to enable/disable wireless quickly while
- wireless is still in the process of re-association with AP
-
-WHAT'S NEW IN RELEASE 5.60.48.36
---------------------------------
-+ Supports up to linux kernel 2.6.32
+ISSUES FIXED AND WHAT'S NEW IN THIS RELEASE
+-------------------------------------------
++ Added 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.)
++ Supports Linux kernel 2.6.38
++ Fix for problem with rebooting while wireless disabled via airline switch.
++ Fixed a kernel panic observed on some 64-bit systems
+
+HOW TO USE MONITOR MODE
+-----------------------
+To enable monitor mode:
+$ echo 1 > /proc/brcm_monitor0
+
+Enabling monitor mode will create a 'prism0' network interface. Wireshark and
+other netwokk tools can use this new prism0 interface.
+
+To disable monitor mode:
+$ echo 0 > /proc/brcm_monitor0
+
+
+ISSUES FIXED AND WHAT'S NEW IN RECENT RELEASES
+-------------------------------------------
++ Supports monitor mode
++ Supports cfg80211
+ Supports hidden networks
-+ Supports rfkill in kernels < 2.6.31
-+ Setting power level via 'iwconfig eth1 txpower X' now operational
-+ Support for bcm4313
-+ Additional channels in both 2.4 and 5 Ghz bands
-+ Fixed issue with tkip group keys that caused this message to repeat often:
- TKIP: RX tkey->key_idx=2 frame keyidx=1 priv=ffff8800cf80e840
-+ Following fixes
- Issue #72216 - Ubuntu 8.04: standby/resume with WPA2 and wpa_supplicant causes
- a continuous assoc/disassoc loop (issue in 2.6.24 kernel)
- Issue #72324 - Ubuntu 8.04: cannot ping when Linux STA is IBSS creator with WEP
- Issue #76739 - Ubuntu 9.04: unable to connect to hidden network after stdby/resume
- Issue #80392 - S4 resume hang with SuSE SLED 11 and 43225
- Issue #80792 - LSTA is not able to associate to AP with transition from AES to TKIP
encryption
++ Supports rfkill
+
KNOWN ISSUES AND LIMITATIONS
----------------------------
#72238 - 20% lower throughput on channels 149, 153, 157, and 161
-#76793 - Ubuntu9.04: STA fails to create IBSS network in 5 Ghz band
-#81392 - Unable to transfer data over ad-hoc network created by NetworkManager (iwconfig
OK)
-#81452 - STA unable to associate to AP when PEAPv1-MSCHAPv2 authentication is used
-#87531 - WPASUP: 4313: WPA Supplicant crashes when trying to connect to 802.1x
+#72324 - Ubuntu 8.04: cannot ping when Linux STA is IBSS creator with WEP
+enabled
+#72216 - Ubuntu 8.04: standby/resume with WPA2 and wpa_supplicant causes
+a continuous assoc/disassoc loop (issue with wpa_supplicant, restarting
+wpa_supplicant fixes the issue)
+#76739 Ubuntu9.04: unable to connect to hidden network after stdby/resume
+#76793 Ubuntu9.04: STA fails to create IBSS network in 5 Ghz band
+
+
+KNOWN ISSUES AND LIMITATIONS IN EXTERNAL COMPONENTS
+----------------------------
+
+wpa_supplicant 0.6.3 + nl80211 + WEP - (Note: This would only affect you if
+you are using wpa_supplicant directly from the command line and specify
+nl80211 interface, e.g. "wpa_supplicant -Dnl80211 -ieth1 ..". If you are using
+network manager GUI to connect it should work file.)
+wpa_supplicant 0.6.3 might have a bug that affect WEP connections created
+through nl80211. Upgrade to wpa_supplicant to 0.7.3 would solve this problem.
+
+Ubuntu 10.10 kernel + nl80211 + WPA/WPA2 - (Note: This would only affect you if
+you are using wpa_supplicant directly from the command line and specify
+nl80211 interface, e.g. "wpa_supplicant -Dnl80211 -ieth1 ..". If you are using
+network manager GUI to connect it should work file.)
+Some kernel versions of Ubuntu such as 2.6.35-22 (released with Ubuntu
+10.10) may have problems that affect WPA/WPA2 connections created through
+nl80211. Upgrade to 2.6.35-25 or later should solve this problem.
+
HOW TO INSTALL A PRE-COMPILED DRIVER
-----------------------------------
Index: broadcom-wl-blacklist.conf
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/broadcom-wl-blacklist.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- broadcom-wl-blacklist.conf 16 Nov 2011 11:14:58 -0000 1.3
+++ broadcom-wl-blacklist.conf 11 Jan 2012 21:42:49 -0000 1.4
@@ -1,7 +1,5 @@
# modules blacklisted for broadcom-wl
-blacklist bcm43xx
blacklist ssb
-blacklist b43
-blacklist ndiswrapper
blacklist bcma
+blacklist b43
blacklist brcmsmac
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/broadcom-wl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- broadcom-wl.spec 16 Nov 2011 11:14:58 -0000 1.13
+++ broadcom-wl.spec 11 Jan 2012 21:42:49 -0000 1.14
@@ -1,17 +1,15 @@
Name: broadcom-wl
-Version: 5.100.82.38
-Release: 2%{?dist}
+Version: 5.100.82.112
+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://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
-Source1:
http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
-Source2:
http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/R...
+Source0:
http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_32-v5_100_82_11...
+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:
http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/b...
-Patch0: broadcom-wl-5.100.82.38-license.patch
-Patch1:
http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/5...
+Patch0: broadcom-wl-5.100.82.112-license.patch
BuildArch: noarch
Provides: wl-kmod-common = %{version}
@@ -30,10 +28,9 @@
%setup -q -c
iconv -f iso8859-1 -t UTF8 lib/LICENSE.txt -o lib/LICENSE.txt
sed -i 's/\r$//' lib/LICENSE.txt
-cp -p %{SOURCE2} %{SOURCE4} .
-chmod 644 lib/LICENSE.txt README.txt bcma.txt
+cp -p %{SOURCE2} .
+chmod 644 lib/LICENSE.txt README.txt
%patch0 -p1 -b .license
-%patch1 -p0 -b .init_MUTEX
%build
echo "Nothing to build."
@@ -48,10 +45,14 @@
%files
%defattr(-,root,root,-)
-%doc lib/LICENSE.txt README.txt bcma.txt
+%doc lib/LICENSE.txt README.txt
%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist.conf
%changelog
+* Wed Jan 11 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> -
5.100.82.112-1
+- Updated version to 5.100.82.112
+- Cleaned-up broadcom-wl-blacklist.conf
+
* Wed Nov 16 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> -
5.100.82.38-2
- Added brcmsmac to broadcom-wl-blacklist.conf
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 16 Nov 2011 11:14:58 -0000 1.11
+++ sources 11 Jan 2012 21:42:49 -0000 1.12
@@ -1,5 +1,4 @@
-cac172f7422fa43264049c7065fe21d6 hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
-c0074a1622c75916442e26763ddf47d0 hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
-24976921c7b8854ed2cd56fbc5b1c13c README.txt
-521622b664cdfe9a6e2b1aea1b2e5c7b bcma.txt
-c655110a94f44daab8192831cb6a4161 broadcom-wl-blacklist.conf
+62d04d148b99f993ef575a71332593a9 hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
+310d7ce233a9a352fbe62c451b2ea309 hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
+24e1e33923375ce9ad4c049f27286fd9 broadcom-wl-blacklist.conf
+6fd54aac59a53559d01520f35500693b README.txt
--- 5_100_82_38.patch DELETED ---
--- broadcom-wl-5.100.82.38-license.patch DELETED ---