From e3663a054a9b2dcb2b7da4c3942632148baf47ab Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Fri, 13 Jan 2006 11:36:44 +0000
Subject: [PATCH 1/1] upgrade madwifi-ng to r1394-20060113

SVN-Revision: 2948
---
 openwrt/target/linux/package/madwifi/Makefile |  4 +-
 .../madwifi/patches/100-kernel_cflags.patch   | 46 +++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/openwrt/target/linux/package/madwifi/Makefile b/openwrt/target/linux/package/madwifi/Makefile
index c6dd8e106f..3f2b4c19b9 100644
--- a/openwrt/target/linux/package/madwifi/Makefile
+++ b/openwrt/target/linux/package/madwifi/Makefile
@@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk
 include ../../rules.mk
 
 PKG_NAME:=madwifi
-PKG_VERSION:=r1358-20051215
+PKG_VERSION:=r1394-20060113
 PKG_RELEASE:=1
-PKG_MD5SUM:=0ef00a095359e5af313f52446ebfbbf1
+PKG_MD5SUM:=03c870933ff4a89ed520fb732c4b553d
 
 PKG_SOURCE_URL:=http://snapshots.madwifi.org/madwifi-ng
 PKG_SOURCE:=$(PKG_NAME)-ng-$(PKG_VERSION).tar.gz
diff --git a/openwrt/target/linux/package/madwifi/patches/100-kernel_cflags.patch b/openwrt/target/linux/package/madwifi/patches/100-kernel_cflags.patch
index 9cfec520b6..61927a6661 100644
--- a/openwrt/target/linux/package/madwifi/patches/100-kernel_cflags.patch
+++ b/openwrt/target/linux/package/madwifi/patches/100-kernel_cflags.patch
@@ -1,18 +1,16 @@
-diff -urN madwifi.old/Makefile madwifi.dev/Makefile
---- madwifi.old/Makefile	2005-07-13 02:35:11.000000000 +0200
-+++ madwifi.dev/Makefile	2005-08-13 22:39:26.973649096 +0200
-@@ -46,7 +46,7 @@
- # NB: the order is important here
- DIRS=	${ATH_HAL} ${ATH_RATE} ${WLAN} ${ATH}
+diff -urN madwifi.old/hal/public/mips-be-elf.inc madwifi.new/hal/public/mips-be-elf.inc
+--- madwifi.old/hal/public/mips-be-elf.inc	2005-11-02 15:33:27.000000000 +0100
++++ madwifi.new/hal/public/mips-be-elf.inc	2006-01-13 12:15:02.000000000 +0100
+@@ -66,5 +66,5 @@
  
--all: configcheck
-+all:
- 	mkdir -p ${SYMBOLSDIR}
- 	for i in ${DIRS}; do \
- 		$(MAKE) -C $$i || exit 1; \
-diff -urN madwifi.old/hal/public/mips-le-elf.inc madwifi.dev/hal/public/mips-le-elf.inc
---- madwifi.old/hal/public/mips-le-elf.inc	2005-08-13 22:36:45.646174000 +0200
-+++ madwifi.dev/hal/public/mips-le-elf.inc	2005-08-13 22:37:52.506010360 +0200
+ LDOPTS=	-EB
+ COPTS+=	-DAH_BYTE_ORDER=AH_BIG_ENDIAN
+-COPTS+=	-G 0 -EB -mno-abicalls -fno-pic -mips2 -Wa,--trap \
++COPTS+=	-G 0 -mno-abicalls -fno-pic -mips32 -Wa,--trap \
+ 	-fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls
+diff -urN madwifi.old/hal/public/mips-le-elf.inc madwifi.new/hal/public/mips-le-elf.inc
+--- madwifi.old/hal/public/mips-le-elf.inc	2005-11-02 15:33:27.000000000 +0100
++++ madwifi.new/hal/public/mips-le-elf.inc	2006-01-13 12:15:02.000000000 +0100
 @@ -63,5 +63,5 @@
  
  LDOPTS=	-EL
@@ -20,13 +18,15 @@ diff -urN madwifi.old/hal/public/mips-le-elf.inc madwifi.dev/hal/public/mips-le-
 -COPTS+=	-G 0 -EL -mno-abicalls -fno-pic -mips2 -Wa,--trap \
 +COPTS+=	-G 0 -mno-abicalls -fno-pic -mips32 -Wa,--trap \
  	-fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls
-diff -urN madwifi.old/hal/public/mips-be-elf.inc madwifi.dev/hal/public/mips-be-elf.inc
---- madwifi.old/hal/public/mips-be-elf.inc.orig	2005-02-22 06:17:25.000000000 -0800
-+++ madwifi.dev/hal/public/mips-be-elf.inc	2005-10-06 15:44:01.000000000 -0700
-@@ -66,5 +66,5 @@
+diff -urN madwifi.old/Makefile madwifi.new/Makefile
+--- madwifi.old/Makefile	2006-01-06 23:52:45.000000000 +0100
++++ madwifi.new/Makefile	2006-01-13 12:15:57.000000000 +0100
+@@ -53,7 +53,7 @@
  
- LDOPTS=	-EB
- COPTS+=	-DAH_BYTE_ORDER=AH_BIG_ENDIAN
--COPTS+=	-G 0 -EB -mno-abicalls -fno-pic -mips2 -Wa,--trap \
-+COPTS+=	-G 0 -mno-abicalls -fno-pic -mips32 -Wa,--trap \
- 	-fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls
+ all: modules tools
+ 
+-modules: configcheck
++modules:
+ 	mkdir -p ${SYMBOLSDIR}
+ 	for i in ${DIRS_MODULES}; do \
+ 		$(MAKE) -C $$i || exit 1; \
-- 
2.30.2