summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvestre Gallon <syl@cvs.openbsd.org>2013-08-08 23:32:51 +0000
committerSylvestre Gallon <syl@cvs.openbsd.org>2013-08-08 23:32:51 +0000
commit4abe90733a77a3d273d8fafa9e0901a0e42934ca (patch)
tree94b1f6976272e08097fcfd7f8d3a887b9e534a8f
parentad67cab56df7438e4864a37249583030f1008d95 (diff)
Add support for Intel Wifi Link 130.
ok kettenis@, mpi@
-rw-r--r--sys/dev/pci/if_iwn.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index 028ed17631b..729ff223cbc 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.121 2013/08/07 01:06:35 bluhm Exp $ */
+/* $OpenBSD: if_iwn.c,v 1.122 2013/08/08 23:32:50 syl Exp $ */
/*-
* Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -90,6 +90,8 @@ static const struct pci_matchid iwn_devices[] = {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_1030_2 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_100_1 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_100_2 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_130_1 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_130_2 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_6235_1 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_6235_2 },
};
@@ -639,12 +641,8 @@ 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_1030_1 ||
- pid == PCI_PRODUCT_INTEL_WL_1030_2 ||
- pid == PCI_PRODUCT_INTEL_WL_6030_1 ||
- pid == PCI_PRODUCT_INTEL_WL_6030_2 ||
- pid == PCI_PRODUCT_INTEL_WL_6235_1 ||
- pid == PCI_PRODUCT_INTEL_WL_6235_2) {
+ if (pid != PCI_PRODUCT_INTEL_WL_6005_1 &&
+ pid != PCI_PRODUCT_INTEL_WL_6005_2) {
sc->fwname = "iwn-6030";
sc->sc_flags |= IWN_FLAG_ADV_BT_COEX;
} else