Module Name: src
Committed By: christos
Date: Fri Aug 23 16:49:53 UTC 2013
Modified Files:
src/sys/dev/pci: if_iwn.c pcidevs
Log Message:
PR/48150: Noriyuki Koizumi: Add support for Intel Centrino Advanced-N 6235
Wi-Fi controller
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/pci/if_iwn.c
cvs rdiff -u -r1.1159 -r1.1160 src/sys/dev/pci/pcidevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_iwn.c
diff -u src/sys/dev/pci/if_iwn.c:1.67 src/sys/dev/pci/if_iwn.c:1.68
--- src/sys/dev/pci/if_iwn.c:1.67 Sun Jul 28 07:46:24 2013
+++ src/sys/dev/pci/if_iwn.c Fri Aug 23 12:49:53 2013
@@ -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 @@ static const pci_product_id_t iwn_device
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 @@ iwn5000_attach(struct iwn_softc *sc, pci
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;
}
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1159 src/sys/dev/pci/pcidevs:1.1160
--- src/sys/dev/pci/pcidevs:1.1159 Wed Jul 17 15:49:11 2013
+++ src/sys/dev/pci/pcidevs Fri Aug 23 12:49:53 2013
@@ -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_RAID1 0x0600 GDT RAID
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
