diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/eeprom.h')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/eeprom.h | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.h b/drivers/net/wireless/ath/ath5k/eeprom.h index 7c09e150dbd..6511c27d938 100644 --- a/drivers/net/wireless/ath/ath5k/eeprom.h +++ b/drivers/net/wireless/ath/ath5k/eeprom.h | |||
@@ -241,9 +241,8 @@ enum ath5k_eeprom_freq_bands{ | |||
241 | #define AR5K_SPUR_SYMBOL_WIDTH_TURBO_100Hz 6250 | 241 | #define AR5K_SPUR_SYMBOL_WIDTH_TURBO_100Hz 6250 |
242 | 242 | ||
243 | #define AR5K_EEPROM_READ(_o, _v) do { \ | 243 | #define AR5K_EEPROM_READ(_o, _v) do { \ |
244 | ret = ath5k_hw_nvram_read(ah, (_o), &(_v)); \ | 244 | if (!ath5k_hw_nvram_read(ah, (_o), &(_v))) \ |
245 | if (ret) \ | 245 | return -EIO; \ |
246 | return ret; \ | ||
247 | } while (0) | 246 | } while (0) |
248 | 247 | ||
249 | #define AR5K_EEPROM_READ_HDR(_o, _v) \ | 248 | #define AR5K_EEPROM_READ_HDR(_o, _v) \ |
@@ -269,29 +268,6 @@ enum ath5k_ctl_mode { | |||
269 | AR5K_CTL_MODE_M = 15, | 268 | AR5K_CTL_MODE_M = 15, |
270 | }; | 269 | }; |
271 | 270 | ||
272 | /* Default CTL ids for the 3 main reg domains. | ||
273 | * Atheros only uses these by default but vendors | ||
274 | * can have up to 32 different CTLs for different | ||
275 | * scenarios. Note that theese values are ORed with | ||
276 | * the mode id (above) so we can have up to 24 CTL | ||
277 | * datasets out of these 3 main regdomains. That leaves | ||
278 | * 8 ids that can be used by vendors and since 0x20 is | ||
279 | * missing from HAL sources i guess this is the set of | ||
280 | * custom CTLs vendors can use. */ | ||
281 | #define AR5K_CTL_FCC 0x10 | ||
282 | #define AR5K_CTL_CUSTOM 0x20 | ||
283 | #define AR5K_CTL_ETSI 0x30 | ||
284 | #define AR5K_CTL_MKK 0x40 | ||
285 | |||
286 | /* Indicates a CTL with only mode set and | ||
287 | * no reg domain mapping, such CTLs are used | ||
288 | * for world roaming domains or simply when | ||
289 | * a reg domain is not set */ | ||
290 | #define AR5K_CTL_NO_REGDOMAIN 0xf0 | ||
291 | |||
292 | /* Indicates an empty (invalid) CTL */ | ||
293 | #define AR5K_CTL_NO_CTL 0xff | ||
294 | |||
295 | /* Per channel calibration data, used for power table setup */ | 271 | /* Per channel calibration data, used for power table setup */ |
296 | struct ath5k_chan_pcal_info_rf5111 { | 272 | struct ath5k_chan_pcal_info_rf5111 { |
297 | /* Power levels in half dbm units | 273 | /* Power levels in half dbm units |