Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1388340pxb; Wed, 10 Feb 2021 07:20:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJyZqNvLiKFHFtOqWXHp1UCBeBERm5nX7afGu1COQgPAqWrL/LLlvbqz1p/gOKZ0KguNYNfR X-Received: by 2002:a17:907:778e:: with SMTP id ky14mr3423752ejc.154.1612970446260; Wed, 10 Feb 2021 07:20:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612970446; cv=none; d=google.com; s=arc-20160816; b=M41KPHqGVkd5oxq0DUKqou2ERDxkSOCLrlFqIwzNMC8/l4MPxfGUj7QalIHqQutcAZ 20JvKHIevKqG6pk6ms/aEVBi478YdGApEDbGt22TZmIUPL1Qtk/Xym85SOq+IxQkJ8cl z9nvDYpkIWy3aMkRqlZ6KGjWBNeeZT0vMB7kB7Kk2csN/fK2Von76XrjRNpw9OV8h20P Ig59Zsq/9zoGs32kuc2xVyiGqnij3P2z/pya5M7/lYa0Of8hQuv3FzvrP7IbS9kaJV2y SdsXuIFzKBtwOs8oTJLmKHzkjYF33u/ALZGjw6frzfyfIk5yHgQzPZzbE7o530LGQgfQ xkfA== 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=+wtXAdIQCZHAgR3MBdgmF144OqZxINx3vS3k2IpiDt4=; b=DGYWOnehTiNXSGa2xW7ulGY7CPfBYHs3lji8LFsOxyZP3JW+2iz+I5qaxmUrGbUkx6 ySqJA36P9NYB3YTvI/+il/JoTC5veYNJEi/+NlzsJogwL42jyATp1yLah0GuDkMFNpOF kCXd2qaEpdjL2x2FuhgszTb9OQu7UgLVpXoEXSWnumdJ7ixuhLMYowT5pc+nArXIaBL9 Qo5OYD+koVf1ZDCakTs/zCCuGLND7hEvdkPZQyup7TFtEpaN2jgSbx1FQKJ830C8RDIO AecAUUxJ8s3RfBH5i02keUwS1jqAK/TFMPDwhu4oFnqA+locBBK+k/kEgWqa628a5TFD Di8Q== 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 ck13si1465063edb.505.2021.02.10.07.20.22; Wed, 10 Feb 2021 07:20:46 -0800 (PST) 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 S231873AbhBJPQS (ORCPT + 99 others); Wed, 10 Feb 2021 10:16:18 -0500 Received: from paleale.coelho.fi ([176.9.41.70]:45280 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S231708AbhBJPQL (ORCPT ); Wed, 10 Feb 2021 10:16:11 -0500 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=redipa.ger.corp.intel.com) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1l9rD7-0049kS-MR; Wed, 10 Feb 2021 17:15:22 +0200 From: Luca Coelho To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org Date: Wed, 10 Feb 2021 17:15:11 +0200 Message-Id: X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210210151514.416221-1-luca@coelho.fi> References: <20210210151514.416221-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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.4 Subject: [PATCH 09/12] iwlwifi: remove max_vht_ampdu_exponent config parameter Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg This is not (or no longer) used, so remove it. Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/iwl-config.h | 3 --- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h index 605628a67c6a..e8b7b7618a3c 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h @@ -327,8 +327,6 @@ struct iwl_fw_mon_regs { * @max_tx_agg_size: max TX aggregation size of the ADDBA request/response * @max_ht_ampdu_factor: the exponent of the max length of A-MPDU that the * station can receive in HT - * @max_vht_ampdu_exponent: the exponent of the max length of A-MPDU that the - * station can receive in VHT * @dccm_offset: offset from which DCCM begins * @dccm_len: length of DCCM (including runtime stack CCM) * @dccm2_offset: offset from which the second DCCM begins @@ -396,7 +394,6 @@ struct iwl_cfg { u8 nvm_hw_section_num; u8 max_tx_agg_size; u8 max_ht_ampdu_exponent; - u8 max_vht_ampdu_exponent; u8 ucode_api_max; u8 ucode_api_min; u16 num_rbds; diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c index fd3aeb5c0c58..af684f80b0cc 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c @@ -453,8 +453,6 @@ static void iwl_init_vht_hw_capab(struct iwl_trans *trans, const struct iwl_cfg *cfg = trans->cfg; int num_rx_ants = num_of_ant(rx_chains); int num_tx_ants = num_of_ant(tx_chains); - unsigned int max_ampdu_exponent = (cfg->max_vht_ampdu_exponent ?: - IEEE80211_VHT_MAX_AMPDU_1024K); vht_cap->vht_supported = true; @@ -462,7 +460,7 @@ static void iwl_init_vht_hw_capab(struct iwl_trans *trans, IEEE80211_VHT_CAP_RXSTBC_1 | IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE | 3 << IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT | - max_ampdu_exponent << + IEEE80211_VHT_MAX_AMPDU_1024K << IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT; if (data->vht160_supported) -- 2.30.0