summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/dvm
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/dvm
parent84c317c9b09f757b4c4a4fb38549ac54d1559419 (diff)
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/dvm')
-rw-r--r--drivers/net/wireless/iwlwifi/dvm/rs.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/rs.h b/drivers/net/wireless/iwlwifi/dvm/rs.h
index 26fc550cd68..41988f4b8a5 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rs.h
+++ b/drivers/net/wireless/iwlwifi/dvm/rs.h
@@ -389,13 +389,6 @@ struct iwl_lq_sta {
u8 last_bt_traffic;
};
-static inline u8 num_of_ant(u8 mask)
-{
- return !!((mask) & ANT_A) +
- !!((mask) & ANT_B) +
- !!((mask) & ANT_C);
-}
-
static inline u8 first_antenna(u8 mask)
{
if (mask & ANT_A)