From: Eyal Shapira <eyal@wizery.com>
Date: Wed, 5 Nov 2014 09:00:41 +0000 (+0200)
Subject: iwlwifi: mvm: rs: fix a WARNING in case of STBC and VHT
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1507fb757a0a706a9aae002d45ea7c12b076a482;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

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>
---

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);