leave ack/cts setting alone by default

[openwrt.git] / package / madwifi / patches / 100-kernel_cflags.patch

diff --git a/package/madwifi/patches/100-kernel_cflags.patch b/package/madwifi/patches/100-kernel_cflags.patch
index ffb600c7a566af7abb1eb8c17d3a277eb5d59665..9c82d6e1253013c6829157f7b1bd092868198907 100644 (file)
--- a/package/madwifi/patches/100-kernel_cflags.patch
+++ b/package/madwifi/patches/100-kernel_cflags.patch
@@ -1,6 +1,7 @@
-diff -urN madwifi-ng-r2377-20070526.old/hal/public/mips-be-elf.inc madwifi-ng-r2377-20070526.dev/hal/public/mips-be-elf.inc
---- madwifi-ng-r2377-20070526.old/hal/public/mips-be-elf.inc   2006-05-27 04:48:16.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/hal/public/mips-be-elf.inc   2007-05-26 18:51:08.033866208 +0200
+Index: madwifi-trunk-r3314/hal/public/mips-be-elf.inc
+===================================================================
+--- madwifi-trunk-r3314.orig/hal/public/mips-be-elf.inc        2008-02-20 18:10:46.339155111 +0100
++++ madwifi-trunk-r3314/hal/public/mips-be-elf.inc     2008-02-20 18:10:46.439160810 +0100
 @@ -71,5 +71,5 @@
  
  LDOPTS=       -EB
@@ -8,9 +9,10 @@ diff -urN madwifi-ng-r2377-20070526.old/hal/public/mips-be-elf.inc madwifi-ng-r2
 -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-ng-r2377-20070526.old/hal/public/mips-le-elf.inc madwifi-ng-r2377-20070526.dev/hal/public/mips-le-elf.inc
---- madwifi-ng-r2377-20070526.old/hal/public/mips-le-elf.inc   2006-05-27 04:48:16.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/hal/public/mips-le-elf.inc   2007-05-26 18:51:08.033866208 +0200
+Index: madwifi-trunk-r3314/hal/public/mips-le-elf.inc
+===================================================================
+--- madwifi-trunk-r3314.orig/hal/public/mips-le-elf.inc        2008-02-20 18:10:46.347155567 +0100
++++ madwifi-trunk-r3314/hal/public/mips-le-elf.inc     2008-02-20 18:10:46.443161036 +0100
 @@ -68,5 +68,5 @@
  
  LDOPTS=       -EL
@@ -18,9 +20,10 @@ diff -urN madwifi-ng-r2377-20070526.old/hal/public/mips-le-elf.inc madwifi-ng-r2
 -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-ng-r2377-20070526.old/hal/public/xscale-be-elf.inc madwifi-ng-r2377-20070526.dev/hal/public/xscale-be-elf.inc
---- madwifi-ng-r2377-20070526.old/hal/public/xscale-be-elf.inc 2006-09-14 08:21:22.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/hal/public/xscale-be-elf.inc 2007-05-26 18:51:08.034866056 +0200
+Index: madwifi-trunk-r3314/hal/public/xscale-be-elf.inc
+===================================================================
+--- madwifi-trunk-r3314.orig/hal/public/xscale-be-elf.inc      2008-02-20 18:10:46.351155793 +0100
++++ madwifi-trunk-r3314/hal/public/xscale-be-elf.inc   2008-02-20 18:10:46.451161492 +0100
 @@ -77,5 +77,5 @@
  
  LDOPTS=       -EB
@@ -28,15 +31,13 @@ diff -urN madwifi-ng-r2377-20070526.old/hal/public/xscale-be-elf.inc madwifi-ng-
 -COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \
 +COPTS+= -march=armv5te -mbig-endian -fno-strict-aliasing -fno-common  \
        -mtune=xscale  -mshort-load-bytes
-diff -urN madwifi-ng-r2377-20070526.old/Makefile madwifi-ng-r2377-20070526.dev/Makefile
---- madwifi-ng-r2377-20070526.old/Makefile     2007-05-26 00:31:56.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/Makefile     2007-05-26 18:51:08.034866056 +0200
-@@ -56,7 +56,7 @@
- 
- all: modules tools
- 
--modules: configcheck svnversion.h
-+modules: svnversion.h
- ifdef LINUX24
-       for i in $(DIRS_MODULES); do \
-               $(MAKE) -C $$i || exit 1; \
+Index: madwifi-trunk-r3314/hal/public/xscale-le-elf.inc
+===================================================================
+--- madwifi-trunk-r3314.orig/hal/public/xscale-le-elf.inc      2008-02-20 18:10:46.363156477 +0100
++++ madwifi-trunk-r3314/hal/public/xscale-le-elf.inc   2008-02-20 18:10:46.455161721 +0100
+@@ -79,4 +79,4 @@
+ LDOPTS=       -EL
+ COPTS+=       -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN
+ COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \
+-      -mapcs-32 -mtune=xscale  -mshort-load-bytes
++      -mtune=xscale  -mshort-load-bytes