From patchwork Fri Oct 24 12:34:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Beldan X-Patchwork-Id: 5147011 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9F854C11AC for ; Fri, 24 Oct 2014 12:35:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DD73E20158 for ; Fri, 24 Oct 2014 12:35:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C008201C0 for ; Fri, 24 Oct 2014 12:35:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932710AbaJXMfF (ORCPT ); Fri, 24 Oct 2014 08:35:05 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:60392 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932554AbaJXMfE (ORCPT ); Fri, 24 Oct 2014 08:35:04 -0400 Received: by mail-wi0-f172.google.com with SMTP id bs8so1074927wib.17 for ; Fri, 24 Oct 2014 05:35:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gooOsyP/6hilaC7a/htcqLYRZ+VIppidjeYp8ZDoaGo=; b=eCaodNuRNcmtEzrMfhuw1Uhv5SE8LzxbwUV1dLcV9tQekRLdZjSJE4kqzy4cpW/hv9 1G62PFnDXa74uGxXzeGYML5n8ObrT2Yi+HQxPtDLnYC3dtiog3ASYc0++tURCOvvztgh PP0/qVAJOD66a5JVEZrZxookUiyTvzgQVDMY6K/IprHYqg76vUCVBM4gdyvQoxeQ2aPY sffoD3+yUo7p/bHY1ippKkpawuHj3x2AcGr5x3rx3/dt0o0SejYePYUEAiHu1Lec8eEt aQSZR/d/u7N21bi8jiWou5penZUKeCN3tEu+JVxijS+JtKne7P7q4fomvxgUDOpPT8SY XmEw== X-Received: by 10.180.93.233 with SMTP id cx9mr3876357wib.48.1414154102760; Fri, 24 Oct 2014 05:35:02 -0700 (PDT) Received: from magnum.frso.rivierawaves.com (vpn.rivierawaves.com. [91.151.119.162]) by mx.google.com with ESMTPSA id q5sm1874387wiy.16.2014.10.24.05.35.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Oct 2014 05:35:02 -0700 (PDT) From: Karl Beldan To: Johannes Berg Cc: linux-wireless , Karl Beldan Subject: [PATCH] mac80211: minstrel_ht: do not always skip ht rates vht_only is true Date: Fri, 24 Oct 2014 14:34:49 +0200 Message-Id: <1414154089-5185-1-git-send-email-karl.beldan@gmail.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1414152061.1934.2.camel@jlt4.sipsolutions.net> References: <1414152061.1934.2.camel@jlt4.sipsolutions.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Karl Beldan When CONFIG_MAC80211_RC_MINSTREL_VHT is set, the module param minstrel_vht_only tells minstrel_ht whether to allow the mix of ht rates with vht rates. ATM, minstrel_ht skips ht rates when minstrel_vht_only is true, but it does that even if vht is not supported, which makes the sta rates fallback to legacy as no ht rate gets enabled. Fixes: 9208247d74bc ("mac80211: minstrel_ht: add basic support for VHT rates <= 3SS@80MHz") Signed-off-by: Karl Beldan --- net/mac80211/rc80211_minstrel_ht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 4666681..c50fd94 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -1193,7 +1193,7 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband, /* HT rate */ if (gflags & IEEE80211_TX_RC_MCS) { #ifdef CONFIG_MAC80211_RC_MINSTREL_VHT - if (minstrel_vht_only) + if (use_vht && minstrel_vht_only) continue; #endif mi->groups[i].supported = mcs->rx_mask[nss - 1];