From 0244e57bb9fb9ebd1dd224bd5789ad9cc24b0175 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Wed, 4 Jun 2008 13:16:18 +0000 Subject: refresh madwifi patches using upstream style SVN-Revision: 11351 --- package/madwifi/patches/200-no_debug.patch | 90 ++++++++++-------------------- 1 file changed, 30 insertions(+), 60 deletions(-) (limited to 'package/madwifi/patches/200-no_debug.patch') diff --git a/package/madwifi/patches/200-no_debug.patch b/package/madwifi/patches/200-no_debug.patch index 3c440c0..5d6a8d0 100644 --- a/package/madwifi/patches/200-no_debug.patch +++ b/package/madwifi/patches/200-no_debug.patch @@ -1,7 +1,5 @@ -Index: madwifi-trunk-r3314/ath/if_ath.c -=================================================================== ---- madwifi-trunk-r3314.orig/ath/if_ath.c -+++ madwifi-trunk-r3314/ath/if_ath.c +--- a/ath/if_ath.c ++++ b/ath/if_ath.c @@ -42,7 +42,6 @@ * This software is derived from work of Atsushi Onoe; his contribution * is greatly appreciated. @@ -101,10 +99,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c /* If we are shutting down or blowing off the DFS channel availability check * then we call this to stop the behavior before we take the rest of the * necessary actions (such as a DFS reaction to radar). */ -Index: madwifi-trunk-r3314/ath_rate/amrr/amrr.c -=================================================================== ---- madwifi-trunk-r3314.orig/ath_rate/amrr/amrr.c -+++ madwifi-trunk-r3314/ath_rate/amrr/amrr.c +--- a/ath_rate/amrr/amrr.c ++++ b/ath_rate/amrr/amrr.c @@ -70,7 +70,9 @@ #include "amrr.h" @@ -115,10 +111,8 @@ Index: madwifi-trunk-r3314/ath_rate/amrr/amrr.c #ifdef AMRR_DEBUG #define DPRINTF(sc, _fmt, ...) do { \ if (sc->sc_debug & 0x10) \ -Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c -=================================================================== ---- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c -+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c +--- a/ath_rate/minstrel/minstrel.c ++++ b/ath_rate/minstrel/minstrel.c @@ -117,7 +117,9 @@ #include "minstrel.h" @@ -129,10 +123,8 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c #ifdef MINSTREL_DEBUG enum { ATH_DEBUG_RATE = 0x00000010 /* rate control */ -Index: madwifi-trunk-r3314/ath_rate/onoe/onoe.c -=================================================================== ---- madwifi-trunk-r3314.orig/ath_rate/onoe/onoe.c -+++ madwifi-trunk-r3314/ath_rate/onoe/onoe.c +--- a/ath_rate/onoe/onoe.c ++++ b/ath_rate/onoe/onoe.c @@ -66,7 +66,9 @@ #include "onoe.h" @@ -143,10 +135,8 @@ Index: madwifi-trunk-r3314/ath_rate/onoe/onoe.c #ifdef ONOE_DEBUG enum { ATH_DEBUG_RATE = 0x00000010, /* rate control */ -Index: madwifi-trunk-r3314/ath_rate/sample/sample.c -=================================================================== ---- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c -+++ madwifi-trunk-r3314/ath_rate/sample/sample.c +--- a/ath_rate/sample/sample.c ++++ b/ath_rate/sample/sample.c @@ -68,7 +68,9 @@ #include "sample.h" @@ -158,10 +148,8 @@ Index: madwifi-trunk-r3314/ath_rate/sample/sample.c #ifdef SAMPLE_DEBUG enum { ATH_DEBUG_RATE = 0x00000010, /* rate control */ -Index: madwifi-trunk-r3314/tools/do_multi.c -=================================================================== ---- madwifi-trunk-r3314.orig/tools/do_multi.c -+++ madwifi-trunk-r3314/tools/do_multi.c +--- a/tools/do_multi.c ++++ b/tools/do_multi.c @@ -9,16 +9,20 @@ progname = basename(argv[0]); @@ -183,10 +171,8 @@ Index: madwifi-trunk-r3314/tools/do_multi.c if(strcmp(progname, "athkey") == 0) ret = athkey_init(argc, argv); if(strcmp(progname, "athstats") == 0) -Index: madwifi-trunk-r3314/tools/Makefile -=================================================================== ---- madwifi-trunk-r3314.orig/tools/Makefile -+++ madwifi-trunk-r3314/tools/Makefile +--- a/tools/Makefile ++++ b/tools/Makefile @@ -48,6 +48,8 @@ all: compile @@ -205,10 +191,8 @@ Index: madwifi-trunk-r3314/tools/Makefile LDFLAGS= -Index: madwifi-trunk-r3314/net80211/ieee80211_linux.h -=================================================================== ---- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.h -+++ madwifi-trunk-r3314/net80211/ieee80211_linux.h +--- a/net80211/ieee80211_linux.h ++++ b/net80211/ieee80211_linux.h @@ -29,8 +29,6 @@ #ifndef _NET80211_IEEE80211_LINUX_H_ #define _NET80211_IEEE80211_LINUX_H_ @@ -218,10 +202,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_linux.h /* #define ATH_DEBUG_SPINLOCKS */ /* announce before spinlocking */ #include -Index: madwifi-trunk-r3314/Makefile.inc -=================================================================== ---- madwifi-trunk-r3314.orig/Makefile.inc -+++ madwifi-trunk-r3314/Makefile.inc +--- a/Makefile.inc ++++ b/Makefile.inc @@ -148,7 +148,8 @@ TOOLS= $(TOP)/tools @@ -232,10 +214,8 @@ Index: madwifi-trunk-r3314/Makefile.inc INCS= -include $(TOP)/include/compat.h -I$(TOP)/include # TARGET defines the target platform architecture. It must match one of -Index: madwifi-trunk-r3314/ath/if_ath_radar.c -=================================================================== ---- madwifi-trunk-r3314.orig/ath/if_ath_radar.c -+++ madwifi-trunk-r3314/ath/if_ath_radar.c +--- a/ath/if_ath_radar.c ++++ b/ath/if_ath_radar.c @@ -19,8 +19,6 @@ * $Id: if_ath_radar.c 2464 2007-06-15 22:51:56Z mtaylor $ */ @@ -254,10 +234,8 @@ Index: madwifi-trunk-r3314/ath/if_ath_radar.c #include "net80211/if_athproto.h" #include "if_athvar.h" -Index: madwifi-trunk-r3314/ath/if_ath_hal.h -=================================================================== ---- madwifi-trunk-r3314.orig/ath/if_ath_hal.h -+++ madwifi-trunk-r3314/ath/if_ath_hal.h +--- a/ath/if_ath_hal.h ++++ b/ath/if_ath_hal.h @@ -1081,6 +1081,7 @@ tail -f /var/log/messages | sed -f hal_unmangle.sed @@ -275,10 +253,8 @@ Index: madwifi-trunk-r3314/ath/if_ath_hal.h #include "if_ath_hal_wrappers.h" #endif /* #ifndef _IF_ATH_HAL_H_ */ -Index: madwifi-trunk-r3314/net80211/ieee80211_var.h -=================================================================== ---- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h -+++ madwifi-trunk-r3314/net80211/ieee80211_var.h +--- a/net80211/ieee80211_var.h ++++ b/net80211/ieee80211_var.h @@ -492,9 +492,10 @@ /* inject a fake radar signal -- used while on a 802.11h DFS channels */ unsigned int (*ic_test_radar)(struct ieee80211com *); @@ -291,10 +267,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_var.h /* DFS channel availability check time (in seconds) */ void (*ic_set_dfs_cac_time)(struct ieee80211com *, unsigned int); unsigned int (*ic_get_dfs_cac_time)(struct ieee80211com *); -Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c -=================================================================== ---- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c -+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c +--- a/net80211/ieee80211_wireless.c ++++ b/net80211/ieee80211_wireless.c @@ -1548,6 +1548,7 @@ return 0; } @@ -333,10 +307,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c set_priv(IEEE80211_IOCTL_ADDMAC, ieee80211_ioctl_addmac), set_priv(IEEE80211_IOCTL_DELMAC, ieee80211_ioctl_delmac), set_priv(IEEE80211_IOCTL_WDSADDMAC, ieee80211_ioctl_wdsmac), -Index: madwifi-trunk-r3314/ath/if_ath_debug.h -=================================================================== ---- madwifi-trunk-r3314.orig/ath/if_ath_debug.h -+++ madwifi-trunk-r3314/ath/if_ath_debug.h +--- a/ath/if_ath_debug.h ++++ b/ath/if_ath_debug.h @@ -68,13 +68,6 @@ ath_keyprint((_sc), __func__, _ix, _hk, _mac); \ } while (0) @@ -367,10 +339,8 @@ Index: madwifi-trunk-r3314/ath/if_ath_debug.h +#endif #endif /* #ifndef _IF_ATH_DEBUG_H_ */ -Index: madwifi-trunk-r3314/net80211/ieee80211_node.c -=================================================================== ---- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c -+++ madwifi-trunk-r3314/net80211/ieee80211_node.c +--- a/net80211/ieee80211_node.c ++++ b/net80211/ieee80211_node.c @@ -920,6 +920,9 @@ ni->ni_rxkeyoff = 0; } -- cgit v1.1