Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp1670303pxy; Mon, 2 Aug 2021 07:31:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyi8tTU7GBFEF7AM23woJ4qRnIWJw/uv4mdc0zvDiLjLNy0hQJy/PkzEdLobgVLeSiWrt9q X-Received: by 2002:a17:906:c1d0:: with SMTP id bw16mr15923114ejb.146.1627914712876; Mon, 02 Aug 2021 07:31:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627914712; cv=none; d=google.com; s=arc-20160816; b=BAhg8rW9FLMCXbvOu6TcoAKbD6Ud08idMJ1CoV59eSyivu4XbYjM8Ypsdej8l/81kk MXrANfcWHmVxCKaCI/lJycxsQIwQbBJRsvvATI/JH4MViaSYvv5wzXa95i8pBi7Tq0z3 qeoleMP3t+/IEpRDWbH8ULx/vV5nLBmmU1/Av7X4Z85i7Tqa9WJkttmPUBYd/D90q6MO cAkclu1ESQjng7oSWhy9rqRRVGcyLTnqh6IoDt/QTOdV06yW8EyVAcXOcm4KvuHsc5of 2Ify3GOpuXw6pRqCb/M7QLJQV5OqHRNkPLexZkgvEfaVaFch3ETSe/pb6TpcZi/JeEGY eAug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from; bh=2CFAh83oekFusNa1z8ZOaUiXnc9AEyKgWgCJIFY2iqU=; b=KVT8ooYCNA/Q10XZeXjK06K5UGC/6UzvoHWDNtbFbnqL6vG9qgWlGAAXy1+8+NYF0L DohISEqpW+/BDzEDh5bJtdboAEjQqb5VWNqGbWy+d1RypDS2xgBO+lXPxTBWiUFmm+3a VJR42xGVN0Wgx0Bovg8TWRJb7R9JHX11JMvqu5hneybhlhil/eAyOhehUJYiemXTKpaB ZPBCq1lpjOx2YcC8WkbLNSdOGjJsZJEjoBytGM4TXPytIPLUoxE7PzBfbCx6Bl3XeyaL ySSAlkAhmH0jo7uZWVev/EkB1QFEcMUdgdv/tOizadDM/izegMWxJW1jW5SAzuFoLYJC 1byA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l33si13090424ede.457.2021.08.02.07.31.29; Mon, 02 Aug 2021 07:31:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234070AbhHBO2z (ORCPT + 99 others); Mon, 2 Aug 2021 10:28:55 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:50968 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S234330AbhHBO2y (ORCPT ); Mon, 2 Aug 2021 10:28:54 -0400 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=kveik.ger.corp.intel.com) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1mAYvn-001xts-NV; Mon, 02 Aug 2021 17:28:41 +0300 From: Luca Coelho To: kvalo@codeaurora.org Cc: luca@coelho.fi, linux-wireless@vger.kernel.org Date: Mon, 2 Aug 2021 17:28:28 +0300 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210802142829.109448-1-luca@coelho.fi> References: <20210802142829.109448-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.5-pre1 (2020-06-20) on farmhouse.coelho.fi X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, TVD_RCVD_IP autolearn=ham autolearn_force=no version=3.4.5-pre1 Subject: [PATCH 11/12] iwlwifi: mvm: clean up number of HW queues Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg Since switching to mac80211 TXQs, we no longer need to advertise more hardware queues than ACs, since we don't even set QUEUE_CONTROL anyway, so the vif->hw_queue[] mapping array won't be used. All we need (at least for now) is for hw->queues to indicate that we have enough queues to handle QoS. Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index b2072e19b5dc..f38d2476d5a3 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -390,7 +390,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) if (mvm->trans->max_skb_frags) hw->netdev_features = NETIF_F_HIGHDMA | NETIF_F_SG; - hw->queues = IEEE80211_MAX_QUEUES; + hw->queues = IEEE80211_NUM_ACS; hw->offchannel_tx_hw_queue = IWL_MVM_OFFCHANNEL_QUEUE; hw->radiotap_mcs_details |= IEEE80211_RADIOTAP_MCS_HAVE_FEC | IEEE80211_RADIOTAP_MCS_HAVE_STBC; -- 2.32.0