diff options
| author | Eyal Shapira | 2013-11-07 18:38:04 +0100 |
|---|---|---|
| committer | Emmanuel Grumbach | 2013-12-09 21:29:05 +0100 |
| commit | a7b8b2ca916ca4ecf248fa12275eeceff510ad22 (patch) | |
| tree | 5ef69e29b52d9781811a36a99bed585f1a409f08 /drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | |
| parent | iwlwifi: pcie: remove minor dead code (diff) | |
| download | kernel-qcow2-linux-a7b8b2ca916ca4ecf248fa12275eeceff510ad22.tar.gz kernel-qcow2-linux-a7b8b2ca916ca4ecf248fa12275eeceff510ad22.tar.xz kernel-qcow2-linux-a7b8b2ca916ca4ecf248fa12275eeceff510ad22.zip | |
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-nvm-parse.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c index 2fab203d3027..94aef22df73a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c @@ -283,7 +283,8 @@ static void iwl_init_vht_hw_capab(const struct iwl_cfg *cfg, IEEE80211_VHT_MCS_NOT_SUPPORTED << 12 | IEEE80211_VHT_MCS_NOT_SUPPORTED << 14); - if (data->valid_rx_ant == 1 || cfg->rx_with_siso_diversity) { + if (num_of_ant(data->valid_rx_ant) == 1 || + cfg->rx_with_siso_diversity) { vht_cap->cap |= IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN | IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN; /* this works because NOT_SUPPORTED == 3 */ |