From patchwork Wed Nov 13 13:17:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Beldan X-Patchwork-Id: 3178131 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A7EA69F39E for ; Wed, 13 Nov 2013 13:18:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 049722058D for ; Wed, 13 Nov 2013 13:18:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7322620490 for ; Wed, 13 Nov 2013 13:18:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756258Ab3KMNSH (ORCPT ); Wed, 13 Nov 2013 08:18:07 -0500 Received: from mail-wi0-f179.google.com ([209.85.212.179]:63326 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754418Ab3KMNSG (ORCPT ); Wed, 13 Nov 2013 08:18:06 -0500 Received: by mail-wi0-f179.google.com with SMTP id fb10so770136wid.6 for ; Wed, 13 Nov 2013 05:18:04 -0800 (PST) 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=C2IBfnA63t1lIe4JOibx946x1tCbISr6RODl7sjOA8E=; b=VO2SzD4pXSYFpXekd+pH93GFpXdpmG0guOREmWOTsO5UJnpq1WUXFx2U+o92Da22bT OJz3d78068YrfdYB4LcKySvwy87vaNBGQd/68yYM5ZvkY1PJex/Us3zMlAJtwYYoAyXv J/3ItR4A/e04aleVjbRIYAdwxaPjmT8HdwFugRp56CSmbmq2oOiOS9dJiZw24/Ea8C5f TvcGHArLgeKIi9Gb0l0GTSOJ9A6C2M4ckTub+/vLanYfZtgrxxvi6Q87ODVkMH4X8/8m ab1dPf8eoH6H0mDCoH+2L+D25wbZCJtO5ab+MRxqYdOJSeHBw7jCiWHwqYkrRSiwNace D06A== X-Received: by 10.180.211.48 with SMTP id mz16mr20678296wic.63.1384348684552; Wed, 13 Nov 2013 05:18:04 -0800 (PST) Received: from magnum.frso.rivierawaves.com (ppp-seco11pa2-46-193-143.43.wb.wifirst.net. [46.193.143.43]) by mx.google.com with ESMTPSA id uc12sm2976656wib.3.2013.11.13.05.18.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Nov 2013 05:18:04 -0800 (PST) From: Karl Beldan To: Johannes Berg Cc: Felix Fietkau , linux-wireless , Karl Beldan Subject: [PATCH] squash! mac80211: minstrel_ht: add basic support for VHT rates <= 80MHz Date: Wed, 13 Nov 2013 14:17:32 +0100 Message-Id: <1384348652-11738-1-git-send-email-karl.beldan@gmail.com> X-Mailer: git-send-email 1.8.2 In-Reply-To: <1384266625-22431-1-git-send-email-karl.beldan@gmail.com> References: <1384266625-22431-1-git-send-email-karl.beldan@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 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 For v2: - In case vht is supported but CONFIG_MAC80211_RC_MINSTREL_VHT is not set or the sta vht tx map has no rate supported (not sure the latter can happen) set vht_only to 0 to not fallback to legacy. Signed-off-by: Karl Beldan --- net/mac80211/rc80211_minstrel_ht.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index a1f3f75..88c932e 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -985,7 +985,13 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband, BUILD_BUG_ON(ARRAY_SIZE(minstrel_mcs_groups) != MINSTREL_GROUPS_NB); /* For the moment be less verbose and disable ht rates for a vht sta */ - vht_only = vht_cap->vht_supported; +#ifdef CONFIG_MAC80211_RC_MINSTREL_VHT + if (vht_cap->vht_supported) + vht_only = vht_cap->vht_mcs.tx_mcs_map != cpu_to_le16(~0); + else +#endif + vht_only = 0; + msp->is_ht = true; memset(mi, 0, sizeof(*mi));