aboutsummaryrefslogtreecommitdiffstats
path: root/package/madwifi
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-05-10 20:13:13 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-05-10 20:13:13 +0000
commited9208de6f66876d65269d91469f3ee498c6825a (patch)
tree89680fdfb79641458771ed25c8c629791c68af97 /package/madwifi
parent1c2db4a6158f731c26b7aadc93a7ec1ee4d72242 (diff)
downloadupstream-ed9208de6f66876d65269d91469f3ee498c6825a.tar.gz
upstream-ed9208de6f66876d65269d91469f3ee498c6825a.tar.bz2
upstream-ed9208de6f66876d65269d91469f3ee498c6825a.zip
madwifi: remove some leftover duplicate definitions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15758 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi')
-rw-r--r--package/madwifi/patches/424-timing.patch34
-rw-r--r--package/madwifi/patches/425-rc_rexmit.patch5
2 files changed, 36 insertions, 3 deletions
diff --git a/package/madwifi/patches/424-timing.patch b/package/madwifi/patches/424-timing.patch
index 47d08deefa..b4c00bd64b 100644
--- a/package/madwifi/patches/424-timing.patch
+++ b/package/madwifi/patches/424-timing.patch
@@ -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
diff --git a/package/madwifi/patches/425-rc_rexmit.patch b/package/madwifi/patches/425-rc_rexmit.patch
index 6b06a85027..407e4b3c16 100644
--- a/package/madwifi/patches/425-rc_rexmit.patch
+++ b/package/madwifi/patches/425-rc_rexmit.patch
@@ -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