X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=ath_rate%2Fminstrel%2Fminstrel.h;h=d963e2d3aa73808edc7df308dad0d7ca41116c2f;hb=35db352fc7ecc973a18c949e048e30c4a067e1ba;hp=56ce52819a2e521dd6989e2fdc355517b6d24b3c;hpb=2c0d8db912df58c3a1b506e144e2b5d72edec617;p=madwifi%2F.git

diff --git a/ath_rate/minstrel/minstrel.h b/ath_rate/minstrel/minstrel.h
index 56ce528..d963e2d 100644
--- a/ath_rate/minstrel/minstrel.h
+++ b/ath_rate/minstrel/minstrel.h
@@ -63,7 +63,7 @@
  */
 
 /*
- * Defintions for the Atheros Wireless LAN controller driver.
+ * Definitions for the Atheros Wireless LAN controller driver.
  */
 #ifndef _DEV_ATH_RATE_MINSTREL_H
 #define _DEV_ATH_RATE_MINSTREL_H
@@ -73,14 +73,9 @@
 struct minstrel_softc {
 	struct ath_ratectrl arc; 	/* base state */
 
-#ifdef CONFIG_SYSCTL
-	struct ctl_table_header *sysctl_header;
-	struct ctl_table *sysctls;
-#endif
 	struct ath_softc  *sc;
 	struct net_device *sc_dev;
 
-
 	struct timer_list timer;	/* periodic timer */
 	int close_timer_now;
 };
@@ -180,14 +175,6 @@ struct minstrel_node {
 #define MAX(a,b)        ((a) > (b) ? (a) : (b))
 #endif
 
-#if 0
-#define WIFI_CW_MIN 31
-#define WIFI_CW_MAX 1023
-#else
-#define WIFI_CW_MIN 3
-#define WIFI_CW_MAX 10
-#endif
-
 /*
  * Definitions for pulling the rate and trie counts from
  * a 5212 h/w descriptor. These Don't belong here; the
@@ -217,6 +204,16 @@ struct minstrel_node {
 #define	AR_XmitRate3		0x000f8000	/* series 3 tx rate */
 #define	AR_XmitRate3_S		15
 
+/* TX ds_ctl3 for 5416 */
+#define	AR5416_XmitRate0	0x000000ff	/* series 0 tx rate */
+#define	AR5416_XmitRate0_S	0
+#define	AR5416_XmitRate1	0x0000ff00	/* series 1 tx rate */
+#define	AR5416_XmitRate1_S	8
+#define	AR5416_XmitRate2	0x00ff0000	/* series 2 tx rate */
+#define	AR5416_XmitRate2_S	16
+#define	AR5416_XmitRate3	0xff000000	/* series 3 tx rate */
+#define	AR5416_XmitRate3_S	24
+
 #define MS(_v, _f)	(((_v) & (_f)) >> _f##_S)
 #endif /* _DEV_ATH_RATE_MINSTEL_H */