summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2005-02-19 13:38:02 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2005-02-19 13:38:02 +0000
commit784b538a7226fe4cab9ecd43eaea792d1e57ed11 (patch)
tree0ac450d104588a7f427752eb25c5faf293f3ed58
parent87de265596547f2aedc62fa19d1c1817248bde50 (diff)
Added support for Intel PRO/Wireless 2225BG PCI adapters.
-rw-r--r--share/man/man4/iwi.47
-rw-r--r--sys/dev/pci/if_iwi.c5
2 files changed, 6 insertions, 6 deletions
diff --git a/share/man/man4/iwi.4 b/share/man/man4/iwi.4
index cecc2c1ae2d..34b350eb8e1 100644
--- a/share/man/man4/iwi.4
+++ b/share/man/man4/iwi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iwi.4,v 1.10 2004/12/11 15:20:01 kevlo Exp $
+.\" $OpenBSD: iwi.4,v 1.11 2005/02/19 13:37:59 damien Exp $
.\"
.\" Copyright (c) 2004
.\" Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
@@ -32,7 +32,7 @@
.Nm iwi
.Nd
.Tn Intel
-PRO/Wireless 2200BG/2915ABG IEEE 802.11A/B/G wireless network adapter
+PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11A/B/G wireless network adapters
.Sh SYNOPSIS
.Cd "iwi* at pci?"
.Sh DESCRIPTION
@@ -40,8 +40,7 @@ The
.Nm
driver provides support for
.Tn Intel
-PRO/Wireless 2200BG and 2915ABG MiniPCI
-network adapters.
+PRO/Wireless 2200BG/2915ABG MiniPCI and 2225BG PCI network adapters.
.Pp
By default, the
.Nm
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index 437f8e675f6..cc49fdc69b7 100644
--- a/sys/dev/pci/if_iwi.c
+++ b/sys/dev/pci/if_iwi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwi.c,v 1.25 2005/02/17 18:28:05 reyk Exp $ */
+/* $OpenBSD: if_iwi.c,v 1.26 2005/02/19 13:38:01 damien Exp $ */
/*-
* Copyright (c) 2004, 2005
@@ -79,6 +79,7 @@
const struct pci_matchid iwi_devices[] = {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_2200BG_3B },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_2225BG },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_2915ABG_3B },
};
@@ -252,7 +253,7 @@ iwi_attach(struct device *parent, struct device *self, void *aux)
printf(", address %s\n", ether_sprintf(ic->ic_myaddr));
- if (PCI_PRODUCT(pa->pa_id) != PCI_PRODUCT_INTEL_PRO_2200BG_3B) {
+ if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_PRO_2915ABG_3B) {
/* set supported .11a rates */
ic->ic_sup_rates[IEEE80211_MODE_11A] = iwi_rateset_11a;