summaryrefslogtreecommitdiff
path: root/sys/dev/pci/if_iwn.c
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2012-11-14 12:30:20 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2012-11-14 12:30:20 +0000
commit98a5860728eeacf24069ce066f6f02fe28f7b04b (patch)
treea9edeca5664ed88bb3f0d3aa4f4bf9b69dbf6530 /sys/dev/pci/if_iwn.c
parent4759006d143b949929faf6e477ba502730351888 (diff)
Use the iwn-6030 firmware for the Intel Centrino Advanced-N 6030 as well.
Makes these variants actually work. Based on a diff from James Turned, also confirmed by weerd@
Diffstat (limited to 'sys/dev/pci/if_iwn.c')
-rw-r--r--sys/dev/pci/if_iwn.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index 3508e0f5d0c..173fe2d1748 100644
--- a/sys/dev/pci/if_iwn.c
+++ b/sys/dev/pci/if_iwn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwn.c,v 1.115 2012/11/11 20:45:31 jcs Exp $ */
+/* $OpenBSD: if_iwn.c,v 1.116 2012/11/14 12:30:19 kettenis Exp $ */
/*-
* Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -639,7 +639,9 @@ iwn5000_attach(struct iwn_softc *sc, pci_product_id_t pid)
break;
case IWN_HW_REV_TYPE_6005:
sc->limits = &iwn6000_sensitivity_limits;
- if (pid == PCI_PRODUCT_INTEL_WL_6235_1) {
+ if (pid == PCI_PRODUCT_INTEL_WL_6030_1 ||
+ pid == PCI_PRODUCT_INTEL_WL_6030_2 ||
+ pid == PCI_PRODUCT_INTEL_WL_6235_1) {
sc->fwname = "iwn-6030";
/* XXX: The 6235 generates a fatal firmware error when