From patchwork Thu Jul 9 11:08:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 6754991 X-Patchwork-Delegate: kvalo@adurom.com 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A50059F319 for ; Thu, 9 Jul 2015 11:09:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C65892069E for ; Thu, 9 Jul 2015 11:09:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CDBCC2069B for ; Thu, 9 Jul 2015 11:09:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752701AbbGILJC (ORCPT ); Thu, 9 Jul 2015 07:09:02 -0400 Received: from mail-la0-f49.google.com ([209.85.215.49]:34276 "EHLO mail-la0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751872AbbGILIz (ORCPT ); Thu, 9 Jul 2015 07:08:55 -0400 Received: by lagx9 with SMTP id x9so243845819lag.1 for ; Thu, 09 Jul 2015 04:08:53 -0700 (PDT) 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=eGgYzR0NJKyoFCESKN8tblDxftCgFpFmJAJEWkuGzFc=; b=4VQOg7EGWwiWNZl5fK+sU9yw9fzAmPOr7VzF3prUw0Es0znc1QL79HN+3wa3pKk58c dQ6eB/PSUqKUqz20fBB0DtX4LXb00Lm83mu5CMna/Jw7YiTE0Hv+4VxmPCUZl1139YtR e0o925IIdu/BfhpHu56uA8epQqK4Np+KQ6UqE= 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=eGgYzR0NJKyoFCESKN8tblDxftCgFpFmJAJEWkuGzFc=; b=Nzu9ARsWjQkiQGFtHDOGMo6UopJvxL3tsK8Q632lcFCyGH9F6Dw/t3EuDDZF93YUCj XKEKnVyGUZ3zHiWzxyo4NIMITMqsmmn38dWW6HoBFq2/Ud0pOoj0KlckYYVKqpYd7rWG yykrzrJXjWr3wRg24PTrBKuKZxy/7w4nctI34DKQXjMd4GCcCHkhR3k/5imGq54zAGa1 3GlbdyxRSSd0JR0cPLuRJ6wiFOfQ++Ny0FFWdnjqFE7wElZJOEme6zAtjzX8rFQmpTIz DsbePRxbd0cWW0QStrwAwIWy7z0lG+s/PTYte0jzHznKZZCwm3iXDnW2dGsWRonsVs4w kXeg== X-Gm-Message-State: ALoCoQlBmdItbmUdJdfXQFO0o+M1D6PfoaUg2PeHcIQ9I5xtRQoHgZHhXId4gQ7sF0gcmR0ZsjkEw+jdlRf/Z/IZVWpu1FFoeaVfckpMtoL88ntrqolB7kX+yVnUyQ6zfrTgqPua8APV X-Received: by 10.152.44.132 with SMTP id e4mr14451389lam.34.1436440133416; Thu, 09 Jul 2015 04:08:53 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by smtp.gmail.com with ESMTPSA id t15sm1433507lbk.0.2015.07.09.04.08.52 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jul 2015 04:08:52 -0700 (PDT) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH 6/6] ath10k: tweak interface combinations Date: Thu, 9 Jul 2015 13:08:39 +0200 Message-Id: <1436440119-30231-7-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436440119-30231-1-git-send-email-michal.kazior@tieto.com> References: <1436440119-30231-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=-3.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RCVD_IN_SBL_CSS,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 Concurrent AP/GO operation on different channels isn't really supported well by the firmware so it's better to remove it from being advertised. Also tune the way station and p2p client interface limits are expressed to allow station + 2x p2p client or station + p2p client + p2p go. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 39 ++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 0ef568c36db9..c41b34843a82 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -6557,8 +6557,11 @@ static const struct ieee80211_iface_combination ath10k_10x_if_comb[] = { static const struct ieee80211_iface_limit ath10k_tlv_if_limit[] = { { .max = 2, - .types = BIT(NL80211_IFTYPE_STATION) | - BIT(NL80211_IFTYPE_AP) | + .types = BIT(NL80211_IFTYPE_STATION), + }, + { + .max = 2, + .types = BIT(NL80211_IFTYPE_AP) | BIT(NL80211_IFTYPE_P2P_CLIENT) | BIT(NL80211_IFTYPE_P2P_GO), }, @@ -6568,6 +6571,26 @@ static const struct ieee80211_iface_limit ath10k_tlv_if_limit[] = { }, }; +static const struct ieee80211_iface_limit ath10k_tlv_qcs_if_limit[] = { + { + .max = 2, + .types = BIT(NL80211_IFTYPE_STATION), + }, + { + .max = 2, + .types = BIT(NL80211_IFTYPE_P2P_CLIENT), + }, + { + .max = 1, + .types = BIT(NL80211_IFTYPE_AP) | + BIT(NL80211_IFTYPE_P2P_GO), + }, + { + .max = 1, + .types = BIT(NL80211_IFTYPE_P2P_DEVICE), + }, +}; + static const struct ieee80211_iface_limit ath10k_tlv_if_limit_ibss[] = { { .max = 1, @@ -6586,7 +6609,7 @@ static struct ieee80211_iface_combination ath10k_tlv_if_comb[] = { { .limits = ath10k_tlv_if_limit, .num_different_channels = 1, - .max_interfaces = 3, + .max_interfaces = 4, .n_limits = ARRAY_SIZE(ath10k_tlv_if_limit), }, { @@ -6600,9 +6623,15 @@ static struct ieee80211_iface_combination ath10k_tlv_if_comb[] = { static struct ieee80211_iface_combination ath10k_tlv_qcs_if_comb[] = { { .limits = ath10k_tlv_if_limit, + .num_different_channels = 1, + .max_interfaces = 4, + .n_limits = ARRAY_SIZE(ath10k_tlv_if_limit), + }, + { + .limits = ath10k_tlv_qcs_if_limit, .num_different_channels = 2, - .max_interfaces = 3, - .n_limits = ARRAY_SIZE(ath10k_tlv_if_limit), + .max_interfaces = 4, + .n_limits = ARRAY_SIZE(ath10k_tlv_qcs_if_limit), }, { .limits = ath10k_tlv_if_limit_ibss,