From patchwork Tue Nov 26 13:57:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3239101 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 360A49F3A0 for ; Tue, 26 Nov 2013 14:10:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 01F252013A for ; Tue, 26 Nov 2013 14:10:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 10DCB2013D for ; Tue, 26 Nov 2013 14:10:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756957Ab3KZOKn (ORCPT ); Tue, 26 Nov 2013 09:10:43 -0500 Received: from mail-ea0-f170.google.com ([209.85.215.170]:35053 "EHLO mail-ea0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756941Ab3KZOKm (ORCPT ); Tue, 26 Nov 2013 09:10:42 -0500 Received: by mail-ea0-f170.google.com with SMTP id k10so3627506eaj.29 for ; Tue, 26 Nov 2013 06:10:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WEtGh/R5KCDUbULPAz32CrnZUmwO/kHLqZTgmWYFCRo=; b=vVvK1VdzAcH2OgBTFlcxSA4FNK2bWpIZDQNYj/mQy77zjHs+nXEy1XlpV7nJwAK6gd GAEKjwFRtutI+UJa9S/FnRSGpax0vtFdZPXYSbvJxGMMcn+236nPezxCyRyi7VRQL8op kHGnduXw952t4N7g7Ayp2UVbM3n3kPw5sA7UU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WEtGh/R5KCDUbULPAz32CrnZUmwO/kHLqZTgmWYFCRo=; b=IpfXs97WjYm1sqfd87y5Y20cuUwe2Ys2Tu8Zz2UWKgKjeCuLPkEOkAxocy+JNZG+D9 MQIYufy+NwrmdE0zL9hbTjrUJjWZRtJZlqsfA+0VlkmfVK4iDrF0xdGx5Cvb9k5UwLCu aL4B8SpIZr9t0BDkwDhgoavOQW12TQbIUOCjMJYNlzieVxIk6N0aJc0yeG5WqasZq8gQ ykmuUb1j3vs8voEMCRlN79EfTSoHx9wvFPYZFw64C4ExAZ3nDiN8jxe60F5QL0/QSb8N UcVpZ6l/RJuqoqb8hRPMK9pA5C8YJNIMFJPaaBOqOy8belV/Up/PuNhmoGAdLmVAAqDI CeKg== X-Gm-Message-State: ALoCoQldBoPWH4BVCO7J7j3BR59vkoI4nZfhY3gpC3APdkoDxCvYuTqeTsRYtIf+ivGYg2hSxzCFI85O1nVZfkFxJliwDZTPhGtqfryp2gBqsJ57+IP2+Z4= X-Received: by 10.14.184.200 with SMTP id s48mr2498418eem.72.1385475041580; Tue, 26 Nov 2013 06:10:41 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id b42sm9376879eem.9.2013.11.26.06.10.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Nov 2013 06:10:41 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH v2 1/3] ath10k: use nss provided by mac80211 Date: Tue, 26 Nov 2013 14:57:38 +0100 Message-Id: <1385474260-22385-2-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1385474260-22385-1-git-send-email-michal.kazior@tieto.com> References: <1385126819-15311-1-git-send-email-michal.kazior@tieto.com> <1385474260-22385-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.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_SIGNED, 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 Calculating STA NSS just from the mcs rateset is not the greatest idea. This should prevent connectivity issues if mac80211 is ever to set rx_nss to something other rather than base on max mcs map. As an example operation mode change notification in assoc request may change rx_nss initial values in the future. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index b70a3b2..15eda44 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -925,7 +925,7 @@ static void ath10k_peer_assoc_h_basic(struct ath10k *ar, else arg->peer_listen_intval = ar->hw->conf.listen_interval; - arg->peer_num_spatial_streams = 1; + arg->peer_num_spatial_streams = max_t(u32, 1, sta->rx_nss); /* * The assoc capabilities are available only in managed mode. @@ -1075,7 +1075,6 @@ static void ath10k_peer_assoc_h_ht(struct ath10k *ar, arg->peer_ht_rates.rates[n++] = i; arg->peer_ht_rates.num_rates = n; - arg->peer_num_spatial_streams = max((n+7) / 8, 1); ath10k_dbg(ATH10K_DBG_MAC, "mac ht peer %pM mcs cnt %d nss %d\n", arg->addr,