Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp6557124ybx; Mon, 11 Nov 2019 10:54:54 -0800 (PST) X-Google-Smtp-Source: APXvYqzfThVuqHDjrSHA5sZneu0wYmd7AzE3f8xcPzVztv/RkMMn5tGDUld37/lDBheYeIJH9IKT X-Received: by 2002:a50:de0b:: with SMTP id z11mr28497762edk.33.1573498494558; Mon, 11 Nov 2019 10:54:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573498494; cv=none; d=google.com; s=arc-20160816; b=M4QuRVwLnn6jJHtXyDmVcG5ys4Gwbn7vlSLcm6XUh8seUlaLdHbxQt4z6QfumeZOWE jCqce3sEjiNwGhXVD7fn2npqixMDqlQ4BkbrB2M30Zo61O/zmYrOOubmb3TLC63Tig7j TePhR949wJ+H9E10cRwyMKS4V4vCEtgE/CK8Fq3UWbiL5xTV2B74q+/YcQQwywB4BrwB vzLFg3+ZyVCA520xf4yiobJfAOdhnXtBwTe3T/HEtff7GQhcCP1Fyp8veL6Wfp/Rwykk FzF7YLsf+UjT/IGtQjihZ5u34NB2BAytW2zhG4h7HNvH01PxI/liaMr1ZmM3+thAOUPw xfKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=5uoBk0Szv1+yeRkTul4Ret65ufIRpZMSe/8Vw++DiKM=; b=vIREsmgGRmaPSGBhm7uKaPDlbt6XjBQ2ZbkYds8j5u2F1sj0ag76WOxUV14xVF32j7 NeXRQ0gRv7AqLLziUhLEZnug6Ekke4Dfe8rpKQKUmVEwIIch37Ew4WTm+lGTEQQDvR2g H6mfz7xrpUFYSX/Q8b4rugBO2RvkpuCy5J0NMCp+M75dX50px0FTDi9j9hWKPqHNquAJ hB3L9EyaRmfcSKeLD/AGIZAxDBCgy1o8jHPLTWCwEcSgJeS+kb/U9ppziEsSTH/9snTB y3d1voBUv/Um+ERgTlYEBz3ofcA3NAdyi7P+Op3SM0vYDXwTzPbtSQi4BVKF8DozaXSc kgKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=D8oowhJ4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id si11si9693883ejb.71.2019.11.11.10.54.30; Mon, 11 Nov 2019 10:54:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=D8oowhJ4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730460AbfKKSyC (ORCPT + 99 others); Mon, 11 Nov 2019 13:54:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:49378 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729714AbfKKSyA (ORCPT ); Mon, 11 Nov 2019 13:54:00 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5A76920818; Mon, 11 Nov 2019 18:53:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498439; bh=hVBubz4rwFYa5gB824UlUc8aIPHfTaoH42m9peRe0Po=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D8oowhJ4AA1Zk8EOz5nsXL5Jd58XCCB9CFfmbMCHGeXMSPOZAvppewuPXhuvixEH5 GrCxcTVjqyGHl602QJ7kgSZD9qFZPl9GgETqaIDlNFlTx5S/4QKHbEtfGEmkboGzjD f7hoU4ZfJuB37/Njr7vpXc7t1g/Fi3L8E9DDlPWE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Luca Coelho , Kalle Valo , Sasha Levin Subject: [PATCH 5.3 121/193] iwlwifi: pcie: fix PCI ID 0x2720 configs that should be soc Date: Mon, 11 Nov 2019 19:28:23 +0100 Message-Id: <20191111181510.101991723@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181459.850623879@linuxfoundation.org> References: <20191111181459.850623879@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Luca Coelho [ Upstream commit 6dea7da7019aa04c02edf1878c9c2e59d6cb75a5 ] Some entries for PCI ID 0x2720 were using iwl9260_2ac_cfg, but the correct is to use iwl9260_2ac_cfg_soc. Fix that. Signed-off-by: Luca Coelho Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index acbadfdbdd3fe..cef29de053932 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -618,9 +618,9 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x271B, 0x0210, iwl9160_2ac_cfg)}, {IWL_PCI_DEVICE(0x271B, 0x0214, iwl9260_2ac_cfg)}, {IWL_PCI_DEVICE(0x271C, 0x0214, iwl9260_2ac_cfg)}, - {IWL_PCI_DEVICE(0x2720, 0x0034, iwl9560_2ac_160_cfg)}, - {IWL_PCI_DEVICE(0x2720, 0x0038, iwl9560_2ac_160_cfg)}, - {IWL_PCI_DEVICE(0x2720, 0x003C, iwl9560_2ac_160_cfg)}, + {IWL_PCI_DEVICE(0x2720, 0x0034, iwl9560_2ac_160_cfg_soc)}, + {IWL_PCI_DEVICE(0x2720, 0x0038, iwl9560_2ac_160_cfg_soc)}, + {IWL_PCI_DEVICE(0x2720, 0x003C, iwl9560_2ac_160_cfg_soc)}, {IWL_PCI_DEVICE(0x2720, 0x0060, iwl9461_2ac_cfg_soc)}, {IWL_PCI_DEVICE(0x2720, 0x0064, iwl9461_2ac_cfg_soc)}, {IWL_PCI_DEVICE(0x2720, 0x00A0, iwl9462_2ac_cfg_soc)}, @@ -640,7 +640,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x2720, 0x1552, iwl9560_killer_2ac_cfg_soc)}, {IWL_PCI_DEVICE(0x2720, 0x2030, iwl9560_2ac_160_cfg_soc)}, {IWL_PCI_DEVICE(0x2720, 0x2034, iwl9560_2ac_160_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x4030, iwl9560_2ac_160_cfg)}, + {IWL_PCI_DEVICE(0x2720, 0x4030, iwl9560_2ac_160_cfg_soc)}, {IWL_PCI_DEVICE(0x2720, 0x4034, iwl9560_2ac_160_cfg_soc)}, {IWL_PCI_DEVICE(0x2720, 0x40A4, iwl9462_2ac_cfg_soc)}, {IWL_PCI_DEVICE(0x2720, 0x4234, iwl9560_2ac_cfg_soc)}, -- 2.20.1