diff options
author | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2008-02-03 21:51:04 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-02-29 15:19:35 -0500 |
commit | d8ee398d183df36083e41e9162b0cf014f38f482 (patch) | |
tree | ee5c10f61aadd7ef8d78a06c3a48151b00ff0945 /drivers/net/wireless/ath5k/base.h | |
parent | 406f2388cc1f6e6c176305bd325cef230ce1afdd (diff) |
ath5k: Port to new bitrate/channel API
Author: Nick Kossifidis <mickflemm@gmail.com>
Tested on 5211, 5213+5112, 5213A+2112A and it wors fine.
Also i figured out a way to process rate vallue found
on status descriptors, it's still buggy but we are getting
closer (i think it improved stability a little).
Changes to hw.c, initvals.c, phy.c
Changes-licensed-under: ISC
Changes to ath5k.h, base.c, base.h
Changes-licensed-under: 3-Clause-BSD
Acked-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Nick Kossifidis <mickflemm@gmail.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath5k/base.h')
-rw-r--r-- | drivers/net/wireless/ath5k/base.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath5k/base.h b/drivers/net/wireless/ath5k/base.h index 8287ae787f12..bbe7a5438154 100644 --- a/drivers/net/wireless/ath5k/base.h +++ b/drivers/net/wireless/ath5k/base.h | |||
@@ -83,7 +83,7 @@ struct ath5k_txq { | |||
83 | #if CHAN_DEBUG | 83 | #if CHAN_DEBUG |
84 | #define ATH_CHAN_MAX (26+26+26+200+200) | 84 | #define ATH_CHAN_MAX (26+26+26+200+200) |
85 | #else | 85 | #else |
86 | #define ATH_CHAN_MAX (14+14+14+252+20) /* XXX what's the max? */ | 86 | #define ATH_CHAN_MAX (14+14+14+252+20) |
87 | #endif | 87 | #endif |
88 | 88 | ||
89 | /* Software Carrier, keeps track of the driver state | 89 | /* Software Carrier, keeps track of the driver state |
@@ -95,12 +95,19 @@ struct ath5k_softc { | |||
95 | struct ieee80211_tx_queue_stats tx_stats; | 95 | struct ieee80211_tx_queue_stats tx_stats; |
96 | struct ieee80211_low_level_stats ll_stats; | 96 | struct ieee80211_low_level_stats ll_stats; |
97 | struct ieee80211_hw *hw; /* IEEE 802.11 common */ | 97 | struct ieee80211_hw *hw; /* IEEE 802.11 common */ |
98 | struct ieee80211_hw_mode modes[NUM_DRIVER_MODES]; | 98 | struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; |
99 | struct ieee80211_channel channels[ATH_CHAN_MAX]; | 99 | struct ieee80211_channel channels[ATH_CHAN_MAX]; |
100 | struct ieee80211_rate rates[AR5K_MAX_RATES * NUM_DRIVER_MODES]; | 100 | struct ieee80211_rate rates[AR5K_MAX_RATES * IEEE80211_NUM_BANDS]; |
101 | enum ieee80211_if_types opmode; | 101 | enum ieee80211_if_types opmode; |
102 | struct ath5k_hw *ah; /* Atheros HW */ | 102 | struct ath5k_hw *ah; /* Atheros HW */ |
103 | 103 | ||
104 | struct ieee80211_supported_band *curband; | ||
105 | |||
106 | u8 a_rates; | ||
107 | u8 b_rates; | ||
108 | u8 g_rates; | ||
109 | u8 xr_rates; | ||
110 | |||
104 | #if ATH5K_DEBUG | 111 | #if ATH5K_DEBUG |
105 | struct ath5k_dbg_info debug; /* debug info */ | 112 | struct ath5k_dbg_info debug; /* debug info */ |
106 | #endif | 113 | #endif |
@@ -169,6 +176,7 @@ struct ath5k_softc { | |||
169 | unsigned int nexttbtt; /* next beacon time in TU */ | 176 | unsigned int nexttbtt; /* next beacon time in TU */ |
170 | 177 | ||
171 | struct timer_list calib_tim; /* calibration timer */ | 178 | struct timer_list calib_tim; /* calibration timer */ |
179 | int power_level; /* Requested tx power in dbm */ | ||
172 | }; | 180 | }; |
173 | 181 | ||
174 | #define ath5k_hw_hasbssidmask(_ah) \ | 182 | #define ath5k_hw_hasbssidmask(_ah) \ |