regen

2 files changed, 22 insertions, 27 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 072b85db9ba..4a1828971d4 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.1502 2009/10/24 17:45:13 damien Exp 
+ *	OpenBSD: pcidevs,v 1.1503 2009/10/26 17:51:21 damien Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -2161,15 +2161,14 @@
 /* Intel products */
 #define	PCI_PRODUCT_INTEL_EESISA	0x0008		/* EES ISA */
 #define	PCI_PRODUCT_INTEL_21145	0x0039		/* 21145 */
-#define	PCI_PRODUCT_INTEL_WIFI_LINK_6000_7	0x0082		/* WiFi Link 6000 */
 #define	PCI_PRODUCT_INTEL_WIFI_LINK_1000_1	0x0083		/* WiFi Link 1000 */
 #define	PCI_PRODUCT_INTEL_WIFI_LINK_1000_2	0x0084		/* WiFi Link 1000 */
-#define	PCI_PRODUCT_INTEL_WIFI_LINK_6050_1	0x0086		/* WiFi Link 6050 */
-#define	PCI_PRODUCT_INTEL_WIFI_LINK_6050_2	0x0087		/* WiFi Link 6050 */
-#define	PCI_PRODUCT_INTEL_WIFI_LINK_6050_3	0x0088		/* WiFi Link 6050 */
-#define	PCI_PRODUCT_INTEL_WIFI_LINK_6050_4	0x0089		/* WiFi Link 6050 */
-#define	PCI_PRODUCT_INTEL_WIFI_LINK_6000_1	0x008d		/* WiFi Link 6000 */
-#define	PCI_PRODUCT_INTEL_WIFI_LINK_6000_2	0x008e		/* WiFi Link 6000 */
+#define	PCI_PRODUCT_INTEL_WIFI_LINK_6050_3X3_1	0x0086		/* WiFi Link 6050 */
+#define	PCI_PRODUCT_INTEL_WIFI_LINK_6050_2X2_1	0x0087		/* WiFi Link 6050 */
+#define	PCI_PRODUCT_INTEL_WIFI_LINK_6050_3X3_2	0x0088		/* WiFi Link 6050 */
+#define	PCI_PRODUCT_INTEL_WIFI_LINK_6050_2X2_2	0x0089		/* WiFi Link 6050 */
+#define	PCI_PRODUCT_INTEL_WIFI_LINK_6000_HYB_1	0x008d		/* WiFi Link 6000 */
+#define	PCI_PRODUCT_INTEL_WIFI_LINK_6000_HYB_2	0x008e		/* WiFi Link 6000 */
 #define	PCI_PRODUCT_INTEL_80303	0x0309		/* 80303 IOP */
 #define	PCI_PRODUCT_INTEL_80312	0x030d		/* 80312 I/O Companion */
 #define	PCI_PRODUCT_INTEL_IOXAPIC_A	0x0326		/* IOxAPIC */
@@ -2997,15 +2996,15 @@
 #define	PCI_PRODUCT_INTEL_PRO_WL_2915ABG_2	0x4224		/* PRO/Wireless 2915ABG */
 #define	PCI_PRODUCT_INTEL_PRO_WL_3945ABG_2	0x4227		/* PRO/Wireless 3945ABG */
 #define	PCI_PRODUCT_INTEL_WIFI_LINK_4965_1	0x4229		/* Wireless WiFi Link 4965 */
-#define	PCI_PRODUCT_INTEL_WIFI_LINK_6000_3	0x422b		/* WiFi Link 6000 */
-#define	PCI_PRODUCT_INTEL_WIFI_LINK_6000_5	0x422c		/* WiFi Link 6000 */
+#define	PCI_PRODUCT_INTEL_WIFI_LINK_6000_3X3_1	0x422b		/* WiFi Link 6000 */
+#define	PCI_PRODUCT_INTEL_WIFI_LINK_6000_IPA_1	0x422c		/* WiFi Link 6000 */
 #define	PCI_PRODUCT_INTEL_WIFI_LINK_4965_2	0x4230		/* Wireless WiFi Link 4965 */
 #define	PCI_PRODUCT_INTEL_WIFI_LINK_5100_1	0x4232		/* WiFi Link 5100 */
 #define	PCI_PRODUCT_INTEL_WIFI_LINK_5300_1	0x4235		/* WiFi Link 5300 */
 #define	PCI_PRODUCT_INTEL_WIFI_LINK_5300_2	0x4236		/* WiFi Link 5300 */
 #define	PCI_PRODUCT_INTEL_WIFI_LINK_5100_2	0x4237		/* WiFi Link 5100 */
-#define	PCI_PRODUCT_INTEL_WIFI_LINK_6000_4	0x4238		/* WiFi Link 6000 */
-#define	PCI_PRODUCT_INTEL_WIFI_LINK_6000_6	0x4239		/* WiFi Link 6000 */
+#define	PCI_PRODUCT_INTEL_WIFI_LINK_6000_3X3_2	0x4238		/* WiFi Link 6000 */
+#define	PCI_PRODUCT_INTEL_WIFI_LINK_6000_IPA_2	0x4239		/* WiFi Link 6000 */
 #define	PCI_PRODUCT_INTEL_WIFI_LINK_5350_1	0x423a		/* WiFi Link 5350 */
 #define	PCI_PRODUCT_INTEL_WIFI_LINK_5350_2	0x423b		/* WiFi Link 5350 */
 #define	PCI_PRODUCT_INTEL_WIFI_LINK_5150_1	0x423c		/* WiFi Link 5150 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 78d6d1cb8f1..b31c415f078 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.1502 2009/10/24 17:45:13 damien Exp 
+ *	OpenBSD: pcidevs,v 1.1503 2009/10/26 17:51:21 damien Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -6336,10 +6336,6 @@ static const struct pci_known_product pci_known_products[] = {
 	    "21145",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_7,
-	    "WiFi Link 6000",
-	},
-	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_1000_1,
 	    "WiFi Link 1000",
 	},
@@ -6348,27 +6344,27 @@ static const struct pci_known_product pci_known_products[] = {
 	    "WiFi Link 1000",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6050_1,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6050_3X3_1,
 	    "WiFi Link 6050",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6050_2,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6050_2X2_1,
 	    "WiFi Link 6050",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6050_3,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6050_3X3_2,
 	    "WiFi Link 6050",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6050_4,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6050_2X2_2,
 	    "WiFi Link 6050",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_1,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_HYB_1,
 	    "WiFi Link 6000",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_2,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_HYB_2,
 	    "WiFi Link 6000",
 	},
 	{
@@ -9680,11 +9676,11 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Wireless WiFi Link 4965",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_3,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_3X3_1,
 	    "WiFi Link 6000",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_5,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_IPA_1,
 	    "WiFi Link 6000",
 	},
 	{
@@ -9708,11 +9704,11 @@ static const struct pci_known_product pci_known_products[] = {
 	    "WiFi Link 5100",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_4,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_3X3_2,
 	    "WiFi Link 6000",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_6,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WIFI_LINK_6000_IPA_2,
 	    "WiFi Link 6000",
 	},
 	{