From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 10 May 2009 20:13:13 +0000 (+0000)
Subject: madwifi: remove some leftover duplicate definitions
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6559aa514a59930825090ff977444c7b8c4ea146;p=openwrt%2Fstaging%2Flinusw.git

madwifi: remove some leftover duplicate definitions

SVN-Revision: 15758
---

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