1
linux/drivers/staging/brcm80211
Linus Torvalds 3f5785ec31 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (89 commits)
  bonding: documentation and code cleanup for resend_igmp
  bonding: prevent deadlock on slave store with alb mode (v3)
  net: hold rtnl again in dump callbacks
  Add Fujitsu 1000base-SX PCI ID to tg3
  bnx2x: protect sequence increment with mutex
  sch_sfq: fix peek() implementation
  isdn: netjet - blacklist Digium TDM400P
  via-velocity: don't annotate MAC registers as packed
  xen: netfront: hold RTNL when updating features.
  sctp: fix memory leak of the ASCONF queue when free asoc
  net: make dev_disable_lro use physical device if passed a vlan dev (v2)
  net: move is_vlan_dev into public header file (v2)
  bug.h: Fix build with CONFIG_PRINTK disabled.
  wireless: fix fatal kernel-doc error + warning in mac80211.h
  wireless: fix cfg80211.h new kernel-doc warnings
  iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled
  dst: catch uninitialized metrics
  be2net: hash key for rss-config cmd not set
  bridge: initialize fake_rtable metrics
  net: fix __dst_destroy_metrics_generic()
  ...

Fix up trivial conflicts in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
2011-05-25 17:00:17 -07:00
..
brcmfmac Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 2011-05-25 17:00:17 -07:00
brcmsmac staging: brcm80211: use correct pointer types in bcm_pktq_flush 2011-05-17 13:31:30 -07:00
include staging: brcm80211: use correct pointer types in bcm_pktq_flush 2011-05-17 13:31:30 -07:00
util staging: brcm80211: fix cast to pointer from integer 2011-05-17 13:31:30 -07:00
Kconfig staging: brcm80211: move utility functions into new module 2011-05-11 13:58:20 -07:00
Makefile staging: brcm80211: move utility functions into new module 2011-05-11 13:58:20 -07:00
README staging: brcm80211: revised README 2011-04-04 22:26:18 -07:00
TODO staging: brcm80211: cleaned up TODO file 2011-04-04 22:26:18 -07:00

Broadcom brcmsmac (mac80211-based softmac PCIe) and brcmfmac (SDIO) drivers.

Completely open source host drivers, no binary object files.

Support for the following chips:
===============================

    brcmsmac (PCIe)
    Name        Device ID
    BCM4313     0x4727
    BCM43224    0x4353
    BCM43225    0x4357

    brcmfmac (SDIO)
    Name
    BCM4329

Both brcmsmac and brcmfmac drivers require firmware files that need to be
separately downloaded.

Firmware
======================
Firmware is available from the Linux firmware repository at:

    git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git
    http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git
    https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git


===============================================================
Broadcom brcmsmac driver
===============================================================
- Support for both 32 and 64 bit Linux kernels


Firmware installation
======================
Copy brcm/bcm43xx-0.fw and brcm/bcm43xx_hdr-0.fw to
/lib/firmware/brcm (or wherever firmware is normally installed
on your system).


===============================================================
Broadcom brcmfmac driver
===============================================================
- Support for 32 bit Linux kernel, 64 bit untested


Firmware installation
======================
Copy brcm/bcm4329-fullmac-4.bin and brcm/bcm4329-fullmac-4.txt
to /lib/firmware/brcm (or wherever firmware is normally installed on your
system).


Contact Info:
=============
Brett Rudley		brudley@broadcom.com
Henry Ptasinski		henryp@broadcom.com
Dowan Kim		dowan@broadcom.com
Roland Vossen		rvossen@broadcom.com
Arend van Spriel	arend@broadcom.com

For more info, refer to: http://linuxwireless.org/en/users/Drivers/brcm80211