diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-11-26 11:14:24 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-11-26 11:14:24 +0000 |
| commit | fc5e33634728bde6c974cd8aeff04d1c32f3aae9 (patch) | |
| tree | 756cdd6a03627c0e603133d236612399bbf21458 /sys/dev/ic/rt2560.c | |
| parent | 11d67ff21f1bb2654684b406d4d681f9fa7fd0b2 (diff) | |
do not have each net80211 driver define its own rates structures. if they use
the standard rates, use some defined by net80211 itself. kernel shrinks a bit
ok jsg mglocker
Diffstat (limited to 'sys/dev/ic/rt2560.c')
| -rw-r--r-- | sys/dev/ic/rt2560.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c index f6e4c23e8e3..ce98c259ca4 100644 --- a/sys/dev/ic/rt2560.c +++ b/sys/dev/ic/rt2560.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2560.c,v 1.26 2006/11/22 20:54:56 damien Exp $ */ +/* $OpenBSD: rt2560.c,v 1.27 2006/11/26 11:14:18 deraadt Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -147,15 +147,6 @@ int rt2560_init(struct ifnet *); void rt2560_stop(struct ifnet *, int); void rt2560_power(int, void *); -/* - * Supported rates for 802.11b/g modes (in 500Kbps unit). - */ -static const struct ieee80211_rateset rt2560_rateset_11b = - { 4, { 2, 4, 11, 22 } }; - -static const struct ieee80211_rateset rt2560_rateset_11g = - { 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } }; - static const struct { uint32_t reg; uint32_t val; @@ -254,8 +245,8 @@ rt2560_attach(void *xsc, int id) IEEE80211_C_WEP; /* s/w WEP */ /* set supported .11b and .11g rates */ - ic->ic_sup_rates[IEEE80211_MODE_11B] = rt2560_rateset_11b; - ic->ic_sup_rates[IEEE80211_MODE_11G] = rt2560_rateset_11g; + ic->ic_sup_rates[IEEE80211_MODE_11B] = ieee80211_std_rateset_11b; + ic->ic_sup_rates[IEEE80211_MODE_11G] = ieee80211_std_rateset_11g; /* set supported .11b and .11g channels (1 through 14) */ for (i = 1; i <= 14; i++) { |