From patchwork Tue Oct 29 07:00:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anilkumar Kolli X-Patchwork-Id: 11217307 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 628E21709 for ; Tue, 29 Oct 2019 07:03:06 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3E19F20830 for ; Tue, 29 Oct 2019 07:03:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lWyt8XUq"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="IpqYdiV3"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="oItUN20j" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3E19F20830 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:Subject:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=XVFOA9oKmtM61yI5+A7TLxoedAg6c8XJJgDn6eCfFCA=; b=lWyt8XUqNZNcRU mZylZU19PDgMQO4clYJcSh2p8o5Sj2pCzzvNkzQJ0TnyL96T3CPGUOav/AJJ/y6ZqygVGR5m4ueNp 1WHt8wUNGyNMVSFYNqEukt4w22ZO1gmyHVPilyNcjsFFbzJCFbB5RXjtvNEqBL7wg18MSzeeSvRuq IBYLQWFS1IKVVquHSkcIPbtVN58qtQ8Epx30yYimN2KpaemYdll1e90it3YgJbEccsJEfafU3wFSF sjVd/vz70urYRHXa8ZkNi1soxeE16S3FUDpgRqEMQpgASCG/V14smxfa4LjuG6OnqFQ4h0DR0VPdL 8+kCCs3MPTYGqrLSRKgA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iPLWx-0003Pg-Oy; Tue, 29 Oct 2019 07:03:03 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iPLV7-0001gH-I8 for ath11k@lists.infradead.org; Tue, 29 Oct 2019 07:01:11 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 59F7660FAA; Tue, 29 Oct 2019 07:01:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1572332468; bh=TJ7QjtcKtfQ5HCSvgvPzgYdaEryOgiTNA9xfxtEF+b0=; h=From:To:Cc:Subject:Date:From; b=IpqYdiV3I8U0YCSbdmzoQEGHyK3AA2uHsFoOvUKfAKNa59h4vFb05bn2sdK77Q99I PBwkTTwRUZxQTgTWFfFsVlfhpQHI6pZybsnqhCAOtThLFdmzdFaiWZf3n1blrNhueA aEumt7EJW2iOVCprG4p/KtjG8N2VjSl/TyylcA6Y= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID,DKIM_SIGNED,SPF_NONE autolearn=no autolearn_force=no version=3.4.0 Received: from localhost (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: akolli@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 6AEE760FB1; Tue, 29 Oct 2019 07:01:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1572332467; bh=TJ7QjtcKtfQ5HCSvgvPzgYdaEryOgiTNA9xfxtEF+b0=; h=From:To:Cc:Subject:Date:From; b=oItUN20jaCxlnoWQ+GltUUf+bwvn0wd7aT6lnyiFdwVwstMBitzqYZwNMa7zZ8l+s hgpW6gekVeBzufaXlUVvMcglYCtkplN2I+84eqPBpnCHkiedMhU/uk74DFsvIMy2qY +MMqyXmrq27qMz2+Vqx2pQle5m9OB7ECq0C6pDE4= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 6AEE760FB1 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=akolli@codeaurora.org From: Anilkumar Kolli To: ath11k@lists.infradead.org Subject: [PATCH] ath11k: mac: Remove WAR on max a-mpdu len in vht Date: Tue, 29 Oct 2019 12:30:56 +0530 Message-Id: <1572332456-5419-1-git-send-email-akolli@codeaurora.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191029_000109_649632_40745153 X-CRM114-Status: UNSURE ( 9.64 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.145.29.96 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: ath11k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "ath11k" Errors-To: ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org Revert commit a24b88b56074424a413a ("ath10k: Fix bug in max. VHT A-MPDU size"), Moving this logic to mac80211. Signed-off-by: Anilkumar Kolli --- drivers/net/wireless/ath/ath11k/mac.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c index d2a4bae6e057..2c9f57e741c3 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -1041,14 +1041,7 @@ static void ath11k_peer_assoc_h_vht(struct ath11k *ar, IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK) >> IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT; - /* Workaround: Some Netgear/Linksys 11ac APs set Rx A-MPDU factor to - * zero in VHT IE. Using it would result in degraded throughput. - * arg->peer_max_mpdu at this point contains HT max_mpdu so keep - * it if VHT max_mpdu is smaller. - */ - arg->peer_max_mpdu = max(arg->peer_max_mpdu, - (1U << (IEEE80211_HT_MAX_AMPDU_FACTOR + - ampdu_factor)) - 1); + arg->peer_max_mpdu = BIT(IEEE80211_HT_MAX_AMPDU_FACTOR + ampdu_factor) - 1; if (sta->bandwidth == IEEE80211_STA_RX_BW_80) arg->bw_80 = true;