Module Name: src
Committed By: christos
Date: Sat Apr 17 15:57:23 UTC 2010
Modified Files:
src/sys/dev/pci: if_iwn.c pcidevs
Log Message:
add support for the 6000. From sverre froyen
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/pci/if_iwn.c
cvs rdiff -u -r1.1026 -r1.1027 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.40 src/sys/dev/pci/if_iwn.c:1.41
--- src/sys/dev/pci/if_iwn.c:1.40 Thu Apr 15 21:40:41 2010
+++ src/sys/dev/pci/if_iwn.c Sat Apr 17 11:57:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwn.c,v 1.40 2010/04/16 01:40:41 christos Exp $ */
+/* $NetBSD: if_iwn.c,v 1.41 2010/04/17 15:57:22 christos Exp $ */
/* $OpenBSD: if_iwn.c,v 1.88 2010/04/10 08:37:36 damien Exp $ */
/*-
@@ -22,7 +22,7 @@
* adapters.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.40 2010/04/16 01:40:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.41 2010/04/17 15:57:22 christos Exp $");
#define IWN_USE_RBUF /* Use local storage for RX */
#undef IWN_HWCRYPTO /* XXX does not even compile yet */
@@ -85,6 +85,7 @@
PCI_PRODUCT_INTEL_PRO_WL_5300AGN_2,
PCI_PRODUCT_INTEL_PRO_WL_5350AGN_1,
PCI_PRODUCT_INTEL_PRO_WL_5350AGN_2,
+ PCI_PRODUCT_INTEL_WIFI_LINK_6000_3X3_2,
#if 0
/* XXX From new OpenBSD iwn driver (not in pcidevs) */
PCI_PRODUCT_INTEL_WIFI_LINK_4965_1,
@@ -100,7 +101,6 @@
PCI_PRODUCT_INTEL_WIFI_LINK_1000_1,
PCI_PRODUCT_INTEL_WIFI_LINK_1000_2,
PCI_PRODUCT_INTEL_WIFI_LINK_6000_3X3_1,
- PCI_PRODUCT_INTEL_WIFI_LINK_6000_3X3_2,
PCI_PRODUCT_INTEL_WIFI_LINK_6000_IPA_1,
PCI_PRODUCT_INTEL_WIFI_LINK_6000_IPA_2,
PCI_PRODUCT_INTEL_WIFI_LINK_6050_2X2_1,
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1026 src/sys/dev/pci/pcidevs:1.1027
--- src/sys/dev/pci/pcidevs:1.1026 Fri Apr 2 16:32:15 2010
+++ src/sys/dev/pci/pcidevs Sat Apr 17 11:57:23 2010
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1026 2010/04/02 20:32:15 jakllsch Exp $
+$NetBSD: pcidevs,v 1.1027 2010/04/17 15:57:23 christos Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2788,6 +2788,7 @@
product INTEL PRO_WL_5300AGN_1 0x4235 Pro/Wireless LAN 5300AGN Mini-PCI Adapter
product INTEL PRO_WL_5300AGN_2 0x4236 Pro/Wireless LAN 5300AGN Mini-PCI Adapter
product INTEL PRO_WL_5100AGN_2 0x4237 Pro/Wireless LAN 5100AGN Mini-PCI Adapter
+product INTEL WIFI_LINK_6000_3X3_2 0x4238 Pro/Wireless LAN 6300AGN Mini-PCI Adapter
product INTEL PRO_WL_5350AGN_1 0x423a Pro/Wireless LAN 5350AGN Mini-PCI Adapter
product INTEL PRO_WL_5350AGN_2 0x423b Pro/Wireless LAN 5350AGN Mini-PCI Adapter
product INTEL 80312_ATU 0x530d 80310 ATU
