madwifi: remove some leftover duplicate definitions

SVN-Revision: 15758
This commit is contained in:
Felix Fietkau 2009-05-10 20:13:13 +00:00
parent 09f06bbfb0
commit 6559aa514a
2 changed files with 36 additions and 3 deletions

View File

@ -728,3 +728,37 @@
int athdebug_init(int argc, char *argv[]);
int athkey_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

View File

@ -241,7 +241,7 @@
static void
--- a/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])
@ -468,11 +468,10 @@
0, 0,
--- a/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])
-
-/*
- * Definitions for pulling the rate and trie counts from
- * a 5212 h/w descriptor. These Don't belong here; the