summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
authorEyal Shapira2014-11-05 10:00:41 +0100
committerEmmanuel Grumbach2014-11-11 16:15:04 +0100
commit1507fb757a0a706a9aae002d45ea7c12b076a482 (patch)
tree04acae67f2b3d6fe32ab2666cc4ef6c90e45f502 /drivers/net/wireless/iwlwifi
parentiwlwifi: mvm: fix init_dbg flow to work as expected (diff)
downloadkernel-qcow2-linux-1507fb757a0a706a9aae002d45ea7c12b076a482.tar.gz
kernel-qcow2-linux-1507fb757a0a706a9aae002d45ea7c12b076a482.tar.xz
kernel-qcow2-linux-1507fb757a0a706a9aae002d45ea7c12b076a482.zip
iwlwifi: mvm: rs: fix a WARNING in case of STBC and VHT
This was taken care of in case we're doing STBC with HT but not when working with VHT. Signed-off-by: Eyal Shapira <eyalx.shapira@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/rs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c
index 6775100a75e9..cb18b609255d 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rs.c
@@ -816,7 +816,7 @@ static int rs_rate_from_ucode_rate(const u32 ucode_rate,
if (nss == 1) {
rate->type = LQ_VHT_SISO;
- WARN_ON_ONCE(num_of_ant != 1);
+ WARN_ON_ONCE(!rate->stbc && num_of_ant != 1);
} else if (nss == 2) {
rate->type = LQ_VHT_MIMO2;
WARN_ON_ONCE(num_of_ant != 2);