summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Glocker <mglocker@cvs.openbsd.org>2007-09-14 13:08:32 +0000
committerMarcus Glocker <mglocker@cvs.openbsd.org>2007-09-14 13:08:32 +0000
commit8f00f23a2b0f39900bb1c2ab894a58e956979ffd (patch)
treec48f2217da1e9fb7e5a4a0fc88ccf534cfc3f0b3
parent5f45d96b8a5d4d5df32c3d08a3dee23c9f83be67 (diff)
Use our standard ratesets from ieee80211 instead.
-rw-r--r--sys/dev/ic/bwi.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index 6b9e13d7e56..a1412f10d2a 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bwi.c,v 1.12 2007/09/14 13:00:41 mglocker Exp $ */
+/* $OpenBSD: bwi.c,v 1.13 2007/09/14 13:08:31 mglocker Exp $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
@@ -496,11 +496,6 @@ static const struct {
static const uint8_t bwi_zero_addr[IEEE80211_ADDR_LEN];
-static const struct ieee80211_rateset bwi_rateset_11b =
- { 4, { 2, 4, 11, 22 } };
-static const struct ieee80211_rateset bwi_rateset_11g =
- { 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } };
-
/* CODE */
int
@@ -707,7 +702,8 @@ bwi_attach(struct bwi_softc *sc)
phy->phy_mode == IEEE80211_MODE_11G) {
uint16_t chan_flags;
- ic->ic_sup_rates[IEEE80211_MODE_11B] = bwi_rateset_11b;
+ ic->ic_sup_rates[IEEE80211_MODE_11B] =
+ ieee80211_std_rateset_11b;
if (phy->phy_mode == IEEE80211_MODE_11B) {
chan_flags = IEEE80211_CHAN_B;
@@ -718,7 +714,8 @@ bwi_attach(struct bwi_softc *sc)
IEEE80211_CHAN_DYN |
IEEE80211_CHAN_2GHZ;
ic->ic_phytype = IEEE80211_T_OFDM;
- ic->ic_sup_rates[IEEE80211_MODE_11G] = bwi_rateset_11g;
+ ic->ic_sup_rates[IEEE80211_MODE_11G] =
+ ieee80211_std_rateset_11g;
}
/* XXX depend on locale */