Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp4373376pxf; Tue, 30 Mar 2021 06:26:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXoKYKm0GoOkq1aTLjfWXeeQgkQsSBSPSMkSoKZwhYo9/1d84tVUY2qlDU1o7lTkJv6fwK X-Received: by 2002:a17:906:3b99:: with SMTP id u25mr33492329ejf.277.1617110800306; Tue, 30 Mar 2021 06:26:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617110800; cv=none; d=google.com; s=arc-20160816; b=a6yACvugRJlpFDChwWVRMWa/fbBfdfowbogG/V7Sfv/nozp7TADpgpZUXJoMno+pAc nhpby9JCiCg9WnShNg0UQPlUIhQeYGJwUONR61x/g0e0tOkXz09UCx6qisSaYReQ7w/q k95v667Kzo0Ldf/yR0x7pFLfeESkUZ6aTQxTebrMn/kGTuTAs3uEna00WsrDhRG/sjA+ oNqgVZxOFITN7e4kLnqnlQehf/BNCUD1UQEJ6RI/zmJF51fU81JCwTvj9GDCOgJTFHgV +vUotgqokqUKxdHEMFtRmS66ZD0sejEItZ3k1mekwf0vBtrGLFPvAiu1TkdJzjVC+DRl yO3Q== 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=hzXVKCWRt4rbiMjsAWID7vzwrF/XbLxiJ+OCEVplOIc=; b=CS4Jn7YxClazLHzZ/iQw3t6ufdAGevqpl2tITumE94nMZGDn22I+QMEtgp9nRpVozR ECzU3ZpiDeQ5JqJsYSB8NuBRvQswiBRyzIL+OAFY4wLo9EEGgazTSulx+HsKw3pHh5gh 0pzu7sMxkiaBwg3lDWX+7odadsE5SrTBJYAB6TYVGy3lO4g1NxSi178g4lE1aXQHV5oX IsDAovYc42dpAbK5CqsATOWNrgNxjEUHXEH3fon1x9atxsA8UryhvtaYPbIFkiXEUiWC vLSG0p5FYzexgaQdu8jB+uxKAXmNVn0R4WU9HTJ7GnJKQNNONMjHB8QbL06wfFOn90qB kBGw== 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 d6si15231346ede.192.2021.03.30.06.26.13; Tue, 30 Mar 2021 06:26:40 -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 S232152AbhC3NZq (ORCPT + 99 others); Tue, 30 Mar 2021 09:25:46 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:43618 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232030AbhC3NZJ (ORCPT ); Tue, 30 Mar 2021 09:25:09 -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 1lREMj-0007fg-D7; Tue, 30 Mar 2021 16:25:07 +0300 From: Luca Coelho To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org Date: Tue, 30 Mar 2021 16:24:54 +0300 Message-Id: X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210330132500.468321-1-luca@coelho.fi> References: <20210330132500.468321-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 06/12] iwlwifi: change step in so-gf struct Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: ybaruch change the step of iwlax210_2ax_cfg_so_jf_a0 to iwlax210_2ax_cfg_so_jf_b0 as it is on the wcd_fw-dev repository. Signed-off-by: ybaruch Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 2 +- drivers/net/wireless/intel/iwlwifi/iwl-config.h | 2 +- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c index d4f3eee81db7..8f98edcff572 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c @@ -604,7 +604,7 @@ const struct iwl_cfg iwl_qnj_b0_hr_b0_cfg = { .num_rbds = IWL_NUM_RBDS_22000_HE, }; -const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0 = { +const struct iwl_cfg iwlax210_2ax_cfg_so_jf_b0 = { .name = "Intel(R) Wireless-AC 9560 160MHz", .fw_name_pre = IWL_SO_A_JF_B_FW_PRE, IWL_DEVICE_AX210, diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h index 6751d012e256..bbf3a7d9ea55 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h @@ -595,7 +595,7 @@ extern const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0; extern const struct iwl_cfg killer1650x_2ax_cfg; extern const struct iwl_cfg killer1650w_2ax_cfg; extern const struct iwl_cfg iwl_qnj_b0_hr_b0_cfg; -extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0; +extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_b0; extern const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0; extern const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0; extern const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0_long; diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index 74503c558d77..f4a36ebfa0ee 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -1164,7 +1164,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) iwl_trans->cfg = &iwlax210_2ax_cfg_ty_gf_a0; } else if (CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id) == CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_JF)) { - iwl_trans->cfg = &iwlax210_2ax_cfg_so_jf_a0; + iwl_trans->cfg = &iwlax210_2ax_cfg_so_jf_b0; } else if (CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id) == CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_GF)) { iwl_trans->cfg = &iwlax211_2ax_cfg_so_gf_a0; -- 2.31.0