Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp954678pxb; Sun, 11 Apr 2021 02:53:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyR4JVIZ0othxnGQiAZYECmNtrxGMxcoJpJLHdGvBKBs5woZpOrudCddrHAieMT3aaArDtJ X-Received: by 2002:aa7:df81:: with SMTP id b1mr24926175edy.1.1618134812264; Sun, 11 Apr 2021 02:53:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618134812; cv=none; d=google.com; s=arc-20160816; b=VNK/65UTyMT55Mcud/a+fSHSAvRz0gciiBeyL1KjQOmAfKDz92qaT16ddAzLYaQn46 /tS0Llzg1aKJRSOhKfy1l72sYiBYI2RcVbDHRmA6dWbKvsmOQfDWj8i6fB1Sp2/dBhJC f54JJIZb6MvYdNFsBFnd0Fz8ogOIOugvS+cyQ7uDzHLPADiaSwtjmblYTgKGEzSAv+NA 9W+Wc17tB+2k/ysQgHD8GRO1ho4K1WT7lKorxOzoLiMt5o4qXnTURoR3W5hiID355EXH XSSbpEbWSaId7QcKoYcsCScxrysJQ4I+wv5YmO4TVWzwQVhe+Ijk6GRVh1MGO43QNnUp tIZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from; bh=4MSfBVRs02UNeIAYtPthHVsum5NkMaZdjWsNsTI+e98=; b=J9zlaEijrwH/DUPu0ix5tQEGPZpwTLmCKS0EoReIBYCn72S8sZRHhMKiTlPRoX9UTA uTBBNgYomOYjrIYKuuBf+gA5LlZCLLQCbqdAU6Ob809fCgph8MiAjik+1rpdZ1jMSPwV IxxVU2tW8iFJgrMRugdliKIodk0qnwqiqiYJ6j/wVL0hr0UQ/e2U86cRwF+hAU9QqvhB e80X/4ZbzLq+FDZpkdtJNJxRY2eWdBZISfIGhSxNJlTV/r5T093ACUFoNYkWMB2VysUp AnZ51L5oozW1gLNfbQDUhrcOWSFVONIzIt0UlALo/DW72/cJNWhRNrmxl0nY8DenXw5L XYZw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j18si5437602edw.209.2021.04.11.02.53.10; Sun, 11 Apr 2021 02:53:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235375AbhDKJwK (ORCPT + 99 others); Sun, 11 Apr 2021 05:52:10 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:44482 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229804AbhDKJwJ (ORCPT ); Sun, 11 Apr 2021 05:52:09 -0400 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=kveik.lan) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1lVWfx-000Jkq-4B; Sun, 11 Apr 2021 12:46:42 +0300 From: Luca Coelho To: kvalo@codeaurora.org Cc: luca@coelho.fi, linux-wireless@vger.kernel.org Date: Sun, 11 Apr 2021 12:46:30 +0300 Message-Id: X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210411094630.431873-1-luca@coelho.fi> References: <20210411094630.431873-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.5-pre1 (2020-06-20) on farmhouse.coelho.fi X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, TVD_RCVD_IP autolearn=ham autolearn_force=no version=3.4.5-pre1 Subject: [PATCH 12/12] iwlwifi: rs-fw: don't support stbc for HE 160 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Mordechay Goodstein Our HE doesn't support it so never set HE 160 stbc Fixes: 3e467b8e4cf4 ("iwlwifi: rs-fw: enable STBC in he correctly") Signed-off-by: Mordechay Goodstein Signed-off-by: Luca Coelho --- .../net/wireless/intel/iwlwifi/mvm/rs-fw.c | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c index 8772b65c9dab..2d58cb969918 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* * Copyright (C) 2017 Intel Deutschland GmbH - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation */ #include "rs.h" #include "fw-api.h" @@ -72,19 +72,15 @@ static u16 rs_fw_get_config_flags(struct iwl_mvm *mvm, bool vht_ena = vht_cap->vht_supported; u16 flags = 0; + /* get STBC flags */ if (mvm->cfg->ht_params->stbc && (num_of_ant(iwl_mvm_get_valid_tx_ant(mvm)) > 1)) { - if (he_cap->has_he) { - if (he_cap->he_cap_elem.phy_cap_info[2] & - IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ) - flags |= IWL_TLC_MNG_CFG_FLAGS_STBC_MSK; - - if (he_cap->he_cap_elem.phy_cap_info[7] & - IEEE80211_HE_PHY_CAP7_STBC_RX_ABOVE_80MHZ) - flags |= IWL_TLC_MNG_CFG_FLAGS_HE_STBC_160MHZ_MSK; - } else if ((ht_cap->cap & IEEE80211_HT_CAP_RX_STBC) || - (vht_ena && - (vht_cap->cap & IEEE80211_VHT_CAP_RXSTBC_MASK))) + if (he_cap->has_he && he_cap->he_cap_elem.phy_cap_info[2] & + IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ) + flags |= IWL_TLC_MNG_CFG_FLAGS_STBC_MSK; + else if (vht_cap->cap & IEEE80211_VHT_CAP_RXSTBC_MASK) + flags |= IWL_TLC_MNG_CFG_FLAGS_STBC_MSK; + else if (ht_cap->cap & IEEE80211_HT_CAP_RX_STBC) flags |= IWL_TLC_MNG_CFG_FLAGS_STBC_MSK; } -- 2.31.0