aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965-hw.h7
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965-rs.h7
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
index a71c32a649d9..f0371ad0a37f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
@@ -1036,13 +1036,6 @@ union iwl4965_tx_power_dual_stream {
1036#define R_MCS_36M_DUAL_MSK 0x400 1036#define R_MCS_36M_DUAL_MSK 0x400
1037#define R_MCS_48M_DUAL_MSK 0x800 1037#define R_MCS_48M_DUAL_MSK 0x800
1038 1038
1039#define is_legacy(tbl) (((tbl) == LQ_G) || ((tbl) == LQ_A))
1040#define is_siso(tbl) (((tbl) == LQ_SISO))
1041#define is_mimo(tbl) (((tbl) == LQ_MIMO))
1042#define is_Ht(tbl) (is_siso(tbl) || is_mimo(tbl))
1043#define is_a_band(tbl) (((tbl) == LQ_A))
1044#define is_g_and(tbl) (((tbl) == LQ_G))
1045
1046/* Flow Handler Definitions */ 1039/* Flow Handler Definitions */
1047 1040
1048/**********************/ 1041/**********************/
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.h b/drivers/net/wireless/iwlwifi/iwl-4965-rs.h
index 0c9552b26c40..31e21e29bbad 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.h
@@ -223,6 +223,13 @@ enum iwl4965_table_type {
223 LQ_MAX, 223 LQ_MAX,
224}; 224};
225 225
226#define is_legacy(tbl) (((tbl) == LQ_G) || ((tbl) == LQ_A))
227#define is_siso(tbl) (((tbl) == LQ_SISO))
228#define is_mimo(tbl) (((tbl) == LQ_MIMO))
229#define is_Ht(tbl) (is_siso(tbl) || is_mimo(tbl))
230#define is_a_band(tbl) (((tbl) == LQ_A))
231#define is_g_and(tbl) (((tbl) == LQ_G))
232
226/* 4965 has 2 antennas/chains for Tx (but 3 for Rx) */ 233/* 4965 has 2 antennas/chains for Tx (but 3 for Rx) */
227enum iwl4965_antenna_type { 234enum iwl4965_antenna_type {
228 ANT_NONE, 235 ANT_NONE,