compat-wireless: add brcm80211 driver

This driver was compile tested on kernel 2.6.29 to 2.6.36.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/Makefile b/Makefile
index b590ca2421da3fa5baafe70d830b058efb979600..61adb0d158646fdfb66551d3e18b7be1528de49b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_COMPAT_BLUETOOTH_MODULES) += drivers/bluetooth/
 
 ifeq ($(CONFIG_STAGING_EXCLUDE_BUILD),)
 obj-$(CONFIG_COMPAT_STAGING) += drivers/staging/ath6kl/
 
 ifeq ($(CONFIG_STAGING_EXCLUDE_BUILD),)
 obj-$(CONFIG_COMPAT_STAGING) += drivers/staging/ath6kl/

+obj-$(CONFIG_COMPAT_STAGING) += drivers/staging/brcm80211/

 endif
 
 
 endif
 
 

diff --git a/config.mk b/config.mk
index f2c62ed9de054f53e5b2d1d4b07735579d17bed1..b61c318620ba25389452430f1d2244616f84065b 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -513,6 +513,10 @@ CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS=y
 # CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set
 CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
 CONFIG_ATH6K_LEGACY=m
 # CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set
 CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
 CONFIG_ATH6K_LEGACY=m

+
+CONFIG_BRCM80211=m
+CONFIG_BRCM80211_PCI=y
+

 endif #CONFIG_WIRELESS_EXT
 endif #CONFIG_MMC
 
 endif #CONFIG_WIRELESS_EXT
 endif #CONFIG_MMC
 

diff --git a/patches/35-backport-brcm80211-Makefile.patch b/patches/35-backport-brcm80211-Makefile.patch
new file mode 100644 (file)
index 0000000..2a94756
--- /dev/null
+++ b/patches/35-backport-brcm80211-Makefile.patch
@@ -0,0 +1,11 @@
+--- a/drivers/staging/brcm80211/Makefile
++++ b/drivers/staging/brcm80211/Makefile
+@@ -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.
+ 
+-EXTRA_CFLAGS := -DBCMDBG -DWLC_HIGH -DSTA -DWME -DWL11N -DDBAND -DBCMDMA32 -DBCMNVRAMR -Idrivers/staging/brcm80211/sys -Idrivers/staging/brcm80211/phy -Idrivers/staging/brcm80211/util -Idrivers/staging/brcm80211/include -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes
++EXTRA_CFLAGS := -DBCMDBG -DWLC_HIGH -DSTA -DWME -DWL11N -DDBAND -DBCMDMA32 -DBCMNVRAMR -I$(obj)/sys -I$(obj)/phy -I$(obj)/util -I$(obj)/include -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes
+ 
+ PCI_CFLAGS := -DWLC_LOW
+ 

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index e000faf0cf5dff88dc843fa7f7ff4fd467e2f530..6ef281d021bb4d3835d0dc7dffe14449ae739c7d 100755 (executable)
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -212,6 +212,7 @@ DRIVERS="$DRIVERS drivers/net/wireless/orinoco"
 
 # Staging drivers
 STAGING_DRIVERS="drivers/staging/ath6kl"
 
 # Staging drivers
 STAGING_DRIVERS="drivers/staging/ath6kl"

+STAGING_DRIVERS="$STAGING_DRIVERS drivers/staging/brcm80211"

 
 # Ethernet drivers
 DRIVERS="$DRIVERS drivers/net/atl1c"
 
 # Ethernet drivers
 DRIVERS="$DRIVERS drivers/net/atl1c"