From patchwork Wed Jan 7 08:28:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 425957 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 45F4214009B; Wed, 7 Jan 2015 19:28:53 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Y8lyz-0002LA-LZ; Wed, 07 Jan 2015 08:28:49 +0000 Received: from mail-pd0-f175.google.com ([209.85.192.175]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Y8lyr-0002JD-MN for kernel-team@lists.ubuntu.com; Wed, 07 Jan 2015 08:28:41 +0000 Received: by mail-pd0-f175.google.com with SMTP id g10so3272212pdj.6 for ; Wed, 07 Jan 2015 00:28:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=y4Lm3gR5t1GOeTqgryfRtnvfsJNmp6Q+cwOsekwM7Do=; b=r064oURq/X2gWUW0Vv6XyLU7Vmx/ItQUNzhhEQl2QUgAMsx3npmN9IBZ8f41EylmLq o52T/B36bB6QAgbItLrXZJ5ksg99SVEgV6Oi0XWpClDnv6aWo9qbNec8jdO1jq+yzNgm 6kM8pA+eLNR3dL4kE1rJgjORTPGWpG8vuZclRdfy6EnWNPyPG6O4ksK9RdddlGuXOuAy vByzM/doL52pY4IHD5rMcJJKhqvZX9Y1fAymdZcdOEOthv9o8H4iiNikBJBHGaFCBG8Q eGAejhtgaNXYJXjuLiaJfDGiDSePOek1C8toW6/s6zQ7L1EdYPwiqw93+juBiLSvwp5y ZJqQ== X-Received: by 10.68.65.35 with SMTP id u3mr3119783pbs.9.1420619320774; Wed, 07 Jan 2015 00:28:40 -0800 (PST) Received: from localhost (61-221-51-174.HINET-IP.hinet.net. [61.221.51.174]) by mx.google.com with ESMTPSA id uq15sm1078286pab.8.2015.01.07.00.28.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Jan 2015 00:28:40 -0800 (PST) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] iwlwifi: fix and add 7265 series HW IDs Date: Wed, 7 Jan 2015 16:28:27 +0800 Message-Id: <1420619307-10973-3-git-send-email-acelan.kao@canonical.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1420619307-10973-1-git-send-email-acelan.kao@canonical.com> References: <1420619307-10973-1-git-send-email-acelan.kao@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Oren Givon BugLink: http://bugs.launchpad.net/bugs/1408222 Update of the HW IDs for the 7265 series. Signed-off-by: Oren Givon Signed-off-by: Emmanuel Grumbach (cherry picked from commit acfcd9ed588465e48efe5ceb67177096d51c95a9) Signed-off-by: AceLan Kao --- drivers/net/wireless/iwlwifi/pcie/drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c index 0075398..b3b1d58 100644 --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c @@ -363,13 +363,12 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { /* 7265 Series */ {IWL_PCI_DEVICE(0x095A, 0x5010, iwl7265_2ac_cfg)}, {IWL_PCI_DEVICE(0x095A, 0x5110, iwl7265_2ac_cfg)}, - {IWL_PCI_DEVICE(0x095A, 0x5112, iwl7265_2ac_cfg)}, {IWL_PCI_DEVICE(0x095A, 0x5100, iwl7265_2ac_cfg)}, - {IWL_PCI_DEVICE(0x095A, 0x510A, iwl7265_2ac_cfg)}, {IWL_PCI_DEVICE(0x095B, 0x5310, iwl7265_2ac_cfg)}, - {IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_2ac_cfg)}, + {IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_n_cfg)}, {IWL_PCI_DEVICE(0x095B, 0x5210, iwl7265_2ac_cfg)}, {IWL_PCI_DEVICE(0x095A, 0x5012, iwl7265_2ac_cfg)}, + {IWL_PCI_DEVICE(0x095A, 0x5412, iwl7265_2ac_cfg)}, {IWL_PCI_DEVICE(0x095A, 0x5410, iwl7265_2ac_cfg)}, {IWL_PCI_DEVICE(0x095A, 0x5510, iwl7265_2ac_cfg)}, {IWL_PCI_DEVICE(0x095A, 0x5400, iwl7265_2ac_cfg)},