]> git.karo-electronics.de Git - linux-beck.git/commitdiff
iwlwifi: mvm: rs: fix a WARNING in case of STBC and VHT
authorEyal Shapira <eyal@wizery.com>
Wed, 5 Nov 2014 09:00:41 +0000 (11:00 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 11 Nov 2014 15:15:04 +0000 (17:15 +0200)
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>
drivers/net/wireless/iwlwifi/mvm/rs.c

index 6775100a75e91a4dc50a50fda9c50b140c04da70..cb18b609255dcbb7189b9c7e94f46435480292a0 100644 (file)
@@ -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);