Received: by 2002:ac0:aa62:0:0:0:0:0 with SMTP id w31-v6csp1974910ima; Thu, 25 Oct 2018 07:48:50 -0700 (PDT) X-Google-Smtp-Source: AJdET5fbQoablhlsXnbQOn/SdIUYuq/wZZL3w+ruryd3nMlVCiHC35nKT1kgqzP/xY+RIaEItHoj X-Received: by 2002:a63:2019:: with SMTP id g25-v6mr1747864pgg.235.1540478930215; Thu, 25 Oct 2018 07:48:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540478930; cv=none; d=google.com; s=arc-20160816; b=T+aCm2Iy6zAMK3vMH+2iNRWX9tMYlJJORxk8H+6hzpIHXaTvJuD9cmkYjmfatMUoGz FwyksqXGO/ss20i/gDTevkwBqOOj1FiBONgJpxQ625vfugAuulmOO1utE4DcNoc/S2VI LsGDT3HLam2365Hkfz5FWmD0+FJYZ8Bm6i3RENwqkdoFC110cRu57mOs06sP657bXrsw 2SaI5GvvWNBqvOL0+v/jDxpVV5XNZffzb8nD7GqX8sRKkFwgp90/eqFZQ7WKEki5aI4P 1mhKYvp9slLwjDZDIkg3/kOAnQIBB1l05qhJR1XKvhlp8qQWRFivFD5VWBeEPYJqsi1x HpKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=KRGs8BkKfI0azKZbykY5hYgftq2EUDpP6Ij5/R/JL8w=; b=X87ohaNuRZMb/9+ywupRWyIuKFEUKDLda2xUSLlgwdQDNE0oCX3yRBhiktPzY2LNIY kbbVv7OrPi7nAgohxVLwZRCLzeLXIw2E0av5J8QSGMSKG+3Xyuo2GFPB5GaxX2Z9V0Im IgHQC3IhnMJnOqOf+UkAudq8z6lFTj0JDrAO+okHQYlKztL7crJOt+RC2/ig98xc7P5/ Mm8LS79f1s4nSLwW21xHIM4TrHLd1BbVeIrVPF4Kjt0k9ufs3bU+C8Rt5Am/dN8wmYT8 k+eeNqEykavjB0uMj3P2FI5ciPyijOPEUG/DBL16HiSOgk1qjZkBG31/eiqIO8kg3L63 ZlGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2jyX1ySr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t6-v6si7395588pgk.306.2018.10.25.07.48.33; Thu, 25 Oct 2018 07:48:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2jyX1ySr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727768AbeJYWnx (ORCPT + 99 others); Thu, 25 Oct 2018 18:43:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:52356 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727699AbeJYWnw (ORCPT ); Thu, 25 Oct 2018 18:43:52 -0400 Received: from sasha-vm.mshome.net (unknown [167.98.65.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 27E2D2054F; Thu, 25 Oct 2018 14:10:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1540476657; bh=SoaFqKjLC72lx7G5tojpsp/OYxgceXGmkm7ULeCanPA=; h=From:To:Cc:Subject:Date:From; b=2jyX1ySrfcD/CLsyiqs6o8AXSyIQXXcslV2QEwI2kgkyXRg6biBBZhsCFfVV3TmNk yb55kGYD3aBrtkgubYCEN3Lqyy0/9BP3sKQEyvcvXzyffw49Saz9+1XBf3dUy1Yf22 Frask9tL0JkZ1pr0Vxsy+QV+UlsfqjDDM4hxywnc= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sara Sharon , Luca Coelho , Sasha Levin Subject: [PATCH AUTOSEL 4.14 01/46] iwlwifi: mvm: check for short GI only for OFDM Date: Thu, 25 Oct 2018 10:10:08 -0400 Message-Id: <20181025141053.213330-1-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sara Sharon [ Upstream commit 4c59ff5a9a9c54cc26c807dc2fa6933f7e9fa4ef ] This bit will be used in CCK to indicate short preamble. Signed-off-by: Sara Sharon Signed-off-by: Luca Coelho Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 3 ++- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c index 2d14a58cbdd7..c73e4be9bde3 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c @@ -439,7 +439,8 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi, rx_status->bw = RATE_INFO_BW_160; break; } - if (rate_n_flags & RATE_MCS_SGI_MSK) + if (!(rate_n_flags & RATE_MCS_CCK_MSK) && + rate_n_flags & RATE_MCS_SGI_MSK) rx_status->enc_flags |= RX_ENC_FLAG_SHORT_GI; if (rate_n_flags & RATE_HT_MCS_GF_MSK) rx_status->enc_flags |= RX_ENC_FLAG_HT_GF; diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c index e2196dc35dc6..8ba8c70571fb 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c @@ -981,7 +981,9 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi, rx_status->bw = RATE_INFO_BW_160; break; } - if (rate_n_flags & RATE_MCS_SGI_MSK) + + if (!(rate_n_flags & RATE_MCS_CCK_MSK) && + rate_n_flags & RATE_MCS_SGI_MSK) rx_status->enc_flags |= RX_ENC_FLAG_SHORT_GI; if (rate_n_flags & RATE_HT_MCS_GF_MSK) rx_status->enc_flags |= RX_ENC_FLAG_HT_GF; -- 2.17.1