Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc

[linux.git] / drivers / net / wireless / iwlwifi / iwl-agn-hw.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h b/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
index 64e3417d19eaec000b8001137ebfe0b5e0443271..123ef5e129d5b734fc42ac31114cb8ea5a70765e 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
@@ -78,6 +78,15 @@
 #define IWLAGN_RTC_DATA_SIZE (IWLAGN_RTC_DATA_UPPER_BOUND - \
                                IWLAGN_RTC_DATA_LOWER_BOUND)
 
+#define IWL60_RTC_INST_LOWER_BOUND             (0x000000)
+#define IWL60_RTC_INST_UPPER_BOUND             (0x040000)
+#define IWL60_RTC_DATA_LOWER_BOUND             (0x800000)
+#define IWL60_RTC_DATA_UPPER_BOUND             (0x814000)
+#define IWL60_RTC_INST_SIZE \
+       (IWL60_RTC_INST_UPPER_BOUND - IWL60_RTC_INST_LOWER_BOUND)
+#define IWL60_RTC_DATA_SIZE \
+       (IWL60_RTC_DATA_UPPER_BOUND - IWL60_RTC_DATA_LOWER_BOUND)
+
 /* RSSI to dBm */
 #define IWLAGN_RSSI_OFFSET     44
 
@@ -85,6 +94,7 @@
 #define IWLAGN_MGMT_DFAULT_RETRY_LIMIT         3
 #define IWLAGN_RTS_DFAULT_RETRY_LIMIT          60
 #define IWLAGN_BAR_DFAULT_RETRY_LIMIT          60
+#define IWLAGN_LOW_RETRY_LIMIT                 7
 
 /* Limit range of txpower output target to be between these values */
 #define IWLAGN_TX_POWER_TARGET_POWER_MIN       (0)     /* 0 dBm: 1 milliwatt */