From 5ca9fb1b342482e6fb01bdda326baa1ec9e1dd6c Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 16 Sep 2009 10:46:20 +0000
Subject: [PATCH] madwifi: sync makefile/config changes from trunk to disable
 compression (fixes a crash bug reported on openwrt-devel@)

SVN-Revision: 17591
---
 package/madwifi/Config.in |  8 ++++++++
 package/madwifi/Makefile  | 27 ++++++++++++---------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/package/madwifi/Config.in b/package/madwifi/Config.in
index e56bfdd31b..3ae86ccd6f 100644
--- a/package/madwifi/Config.in
+++ b/package/madwifi/Config.in
@@ -5,6 +5,14 @@ config MADWIFI_DEBUG
 	depends on DEVEL && PACKAGE_kmod-madwifi
 	default n
 
+config MADWIFI_COMPRESSION
+	bool "Enable Atheros Super A/G Compression"
+	depends on PACKAGE_kmod-madwifi
+	depends !TARGET_ar71xx
+	default n
+	help
+	  Enables Atheros Super A/G Hardware Compression Engine.
+
 choice
 	prompt "Madwifi version"
 	depends on PACKAGE_kmod-madwifi
diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index cab8c3620d..fcde633b93 100644
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -17,13 +17,11 @@ PKG_RELEASE:=2.2
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://svn.madwifi.org/madwifi/$(if $(PKG_BRANCH),branches/$(PKG_BRANCH),trunk)
+PKG_SOURCE_URL:=http://madwifi-project.org/svn/madwifi/$(if $(PKG_BRANCH),branches/$(PKG_BRANCH),trunk)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION)
 
-PATCH_DIR=./patches
-
 HAL_VERSION:=20090508
 HAL_FILE:=ath_hal-$(HAL_VERSION).tgz
 HAL_MD5SUM:=4ab7ae8bdb96c0be388c98bf8f92d5ca
@@ -32,7 +30,11 @@ PKG_BUILD_DEPENDS:=wprobe
 
 include $(INCLUDE_DIR)/package.mk
 
-COMPRESSION:=1
+ifdef CONFIG_MADWIFI_COMPRESSION
+  COMPRESSION:=1
+else
+  COMPRESSION:=0
+endif
 
 define Download/hal
   FILE:=$(HAL_FILE)
@@ -59,10 +61,10 @@ ifneq ($(CONFIG_CPU_MIPS32_R2),)
   endif
 else
   ifeq ($(ARCH),mips)
-    HAL_TARGET:=$(if $(CONFIG_MADWIFI_UPSTREAM),mips-be-elf,mips32-be-elf)
+    HAL_TARGET:=mips32-be-elf
   endif
   ifeq ($(ARCH),mipsel)
-    HAL_TARGET:=$(if $(CONFIG_MADWIFI_UPSTREAM),mips-le-elf,mips32-le-elf)
+    HAL_TARGET:=mips32-le-elf
   endif
 endif
 ifeq ($(ARCH),i386)
@@ -139,18 +141,15 @@ ifeq ($(findstring PCI,$(BUS)),PCI)
   MADWIFI_AUTOLOAD+= ath_pci
 endif
 
-MADWIFI_APPLETS:=80211stats athchans athkey athstats wlanconfig ath_info
+MADWIFI_APPLETS:=80211stats athchans athkey athstats wlanconfig ath_info madwifi_multi
 ifdef CONFIG_MADWIFI_DEBUG
   MADWIFI_APPLETS += athdebug 80211debug
 endif
-ifndef CONFIG_MADWIFI_UPSTREAM
-  MADWIFI_APPLETS += madwifi_multi
-endif
 
 define KernelPackage/madwifi
   SUBMENU:=Wireless Drivers
   TITLE:=Driver for Atheros wireless chipsets
-  URL:=http://madwifi.org/
+  URL:=http://madwifi-project.org/
   DEPENDS:=+wireless-tools @PCI_SUPPORT||TARGET_atheros @!TARGET_avr32 @!TARGET_etrax @LINUX_2_6
   FILES:=$(MADWIFI_FILES)
   AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD))
@@ -193,15 +192,13 @@ MAKE_ARGS:= \
 MAKE_VARS:= \
 	COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"' -DATH_REVERSE_ENGINEERING=1" \
 
-ifeq ($(CONFIG_MADWIFI_UPSTREAM),)
-  define Build/Prepare/HAL
+define Build/Prepare/HAL
 	rm -rf $(PKG_BUILD_DIR)/tmp
 	mkdir -p $(PKG_BUILD_DIR)/tmp
 	tar xvzf $(DL_DIR)/$(HAL_FILE) -C $(PKG_BUILD_DIR)/tmp
 	$(CP) $(PKG_BUILD_DIR)/tmp/ath_hal*/* $(PKG_BUILD_DIR)/hal/
 	rm -rf $(PKG_BUILD_DIR)/tmp
-  endef
-endif
+endef
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
-- 
2.30.2