summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-config.h
diff options
context:
space:
mode:
authorEyal Shapira <eyal@wizery.com>2013-11-07 19:38:04 +0200
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2013-12-09 22:29:05 +0200
commita7b8b2ca916ca4ecf248fa12275eeceff510ad22 (patch)
tree5ef69e29b52d9781811a36a99bed585f1a409f08 /drivers/net/wireless/iwlwifi/iwl-config.h
parent84c317c9b09f757b4c4a4fb38549ac54d1559419 (diff)
downloadop-kernel-dev-a7b8b2ca916ca4ecf248fa12275eeceff510ad22.zip
op-kernel-dev-a7b8b2ca916ca4ecf248fa12275eeceff510ad22.tar.gz
iwlwifi: fix check for a single rx antenna
valid_rx_ant is a bitmask of available antennas and not the number of Rx antennas. Use num_of_ant and remove duplicate definitions in both dvm and mvm. Signed-off-by: Eyal Shapira <eyal@wizery.com> Reviewed-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-config.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-config.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h
index 03fd9aa..0b91624 100644
--- a/drivers/net/wireless/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/iwlwifi/iwl-config.h
@@ -129,6 +129,12 @@ enum iwl_led_mode {
#define ANT_BC (ANT_B | ANT_C)
#define ANT_ABC (ANT_A | ANT_B | ANT_C)
+static inline u8 num_of_ant(u8 mask)
+{
+ return !!((mask) & ANT_A) +
+ !!((mask) & ANT_B) +
+ !!((mask) & ANT_C);
+}
/*
* @max_ll_items: max number of OTP blocks
OpenPOWER on IntegriCloud