[src/trunk]: src/sys/dev/pci PR/48150: Noriyuki Koizumi: Add support for Inte...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/39167b8ac191
branches:  trunk
changeset: 789587:39167b8ac191
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Aug 23 16:49:53 2013 +0000

description:
PR/48150: Noriyuki Koizumi: Add support for Intel Centrino Advanced-N 6235
Wi-Fi controller

diffstat:

 sys/dev/pci/if_iwn.c |  8 +++++---
 sys/dev/pci/pcidevs  |  3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (53 lines):

diff -r 656a230bce06 -r 39167b8ac191 sys/dev/pci/if_iwn.c
--- a/sys/dev/pci/if_iwn.c      Fri Aug 23 16:01:35 2013 +0000
+++ b/sys/dev/pci/if_iwn.c      Fri Aug 23 16:49:53 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_iwn.c,v 1.67 2013/07/28 11:46:24 prlw1 Exp $        */
+/*     $NetBSD: if_iwn.c,v 1.68 2013/08/23 16:49:53 christos Exp $     */
 /*     $OpenBSD: if_iwn.c,v 1.119 2013/05/29 23:16:52 yuo Exp $        */
 
 /*-
@@ -22,7 +22,7 @@
  * adapters.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.67 2013/07/28 11:46:24 prlw1 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.68 2013/08/23 16:49:53 christos Exp $");
 
 #define IWN_USE_RBUF   /* Use local storage for RX */
 #undef IWN_HWCRYPTO    /* XXX does not even compile yet */
@@ -102,6 +102,7 @@
        PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_2,
        PCI_PRODUCT_INTEL_WIFI_LINK_6230_1,
        PCI_PRODUCT_INTEL_WIFI_LINK_6230_2,
+       PCI_PRODUCT_INTEL_WIFI_LINK_6235,
 };
 
 /*
@@ -731,7 +732,8 @@
                if (pid == PCI_PRODUCT_INTEL_WIFI_LINK_1030_1 ||
                    pid == PCI_PRODUCT_INTEL_WIFI_LINK_1030_2 ||
                    pid == PCI_PRODUCT_INTEL_WIFI_LINK_6230_1 ||
-                   pid == PCI_PRODUCT_INTEL_WIFI_LINK_6230_2) {
+                   pid == PCI_PRODUCT_INTEL_WIFI_LINK_6230_2 ||
+                   pid == PCI_PRODUCT_INTEL_WIFI_LINK_6235) {
                        sc->fwname = "iwlwifi-6000g2b-6.ucode";
                        ops->config_bt_coex = iwn_config_bt_coex_adv1;
                }
diff -r 656a230bce06 -r 39167b8ac191 sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs       Fri Aug 23 16:01:35 2013 +0000
+++ b/sys/dev/pci/pcidevs       Fri Aug 23 16:49:53 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1159 2013/07/17 19:49:11 soren Exp $
+$NetBSD: pcidevs,v 1.1160 2013/08/23 16:49:53 christos Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2544,6 +2544,7 @@
 product INTEL GDT_RAID2                0x061f  GDT RAID
 product INTEL WIFI_LINK_2230_1 0x0887  Centrino Wireless-N 2230
 product INTEL WIFI_LINK_2230_2 0x0888  Centrino Wireless-N 2230
+product INTEL WIFI_LINK_6235   0x088e  Centrino Advanced-N 6235
 product INTEL 80960RM          0x0962  i960 RM PCI-PCI
 product INTEL 80960RN          0x0964  i960 RN PCI-PCI
 product INTEL HASWELL_HOST_DRAM        0x0c00  Haswell Host Bridge, DRAM