hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

madwifi: remove some leftover duplicate definitions 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15758 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2009-05-10 20:13:13 +00:00
parent 1c2db4a615
commit ed9208de6f
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
package/madwifi/patches/424-timing.patch
View File

@ -728,3 +728,37 @@
int athdebug_init(int argc, char *argv[]); int athdebug_init(int argc, char *argv[]);
int athkey_init(int argc, char *argv[]); int athkey_init(int argc, char *argv[]);
int athstats_init(int argc, char *argv[]); int athstats_init(int argc, char *argv[]);
--- a/ath_rate/minstrel/minstrel.h
+++ b/ath_rate/minstrel/minstrel.h
@@ -172,14 +172,6 @@ struct minstrel_node {
#define ATH_NODE_MINSTREL(an) ((struct minstrel_node *)&an[1])
-
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
/*
* Definitions for pulling the rate and trie counts from
* a 5212 h/w descriptor. These Don't belong here; the
--- a/ath_rate/sample/sample.h
+++ b/ath_rate/sample/sample.h
@@ -98,14 +98,6 @@ struct sample_node {
};
#define ATH_NODE_SAMPLE(an) ((struct sample_node *)&an[1])
-
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
/*
* Definitions for pulling the rate and trie counts from
* a 5212 h/w descriptor. These Don't belong here; the

5
package/madwifi/patches/425-rc_rexmit.patch
View File

@ -241,7 +241,7 @@
static void static void
--- a/ath_rate/minstrel/minstrel.h --- a/ath_rate/minstrel/minstrel.h
+++ b/ath_rate/minstrel/minstrel.h +++ b/ath_rate/minstrel/minstrel.h
@@ -171,36 +171,6 @@ struct minstrel_node { @@ -172,36 +172,6 @@ struct minstrel_node {
#define ATH_NODE_MINSTREL(an) ((struct minstrel_node *)&an[1]) #define ATH_NODE_MINSTREL(an) ((struct minstrel_node *)&an[1])
@ -468,11 +468,10 @@
0, 0, 0, 0,
--- a/ath_rate/sample/sample.h --- a/ath_rate/sample/sample.h
+++ b/ath_rate/sample/sample.h +++ b/ath_rate/sample/sample.h
@@ -98,36 +98,4 @@ struct sample_node { @@ -98,35 +98,4 @@ struct sample_node {
}; };
#define ATH_NODE_SAMPLE(an) ((struct sample_node *)&an[1]) #define ATH_NODE_SAMPLE(an) ((struct sample_node *)&an[1])
-
-/* -/*
- * Definitions for pulling the rate and trie counts from - * Definitions for pulling the rate and trie counts from
- * a 5212 h/w descriptor. These Don't belong here; the - * a 5212 h/w descriptor. These Don't belong here; the