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/pci/if_iwi.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/pci/if_iwi.c')
| -rw-r--r-- | sys/dev/pci/if_iwi.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index 3b7c0498a12..7d6908936a2 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.77 2006/10/23 18:19:26 damien Exp $ */ +/* $OpenBSD: if_iwi.c,v 1.78 2006/11/26 11:14:22 deraadt Exp $ */ /*- * Copyright (c) 2004-2006 @@ -83,15 +83,6 @@ const struct pci_matchid iwi_devices[] = { { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_2915ABG_2 } }; -static const struct ieee80211_rateset iwi_rateset_11a = - { 8, { 12, 18, 24, 36, 48, 72, 96, 108 } }; - -static const struct ieee80211_rateset iwi_rateset_11b = - { 4, { 2, 4, 11, 22 } }; - -static const struct ieee80211_rateset iwi_rateset_11g = - { 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } }; - int iwi_match(struct device *, void *, void *); void iwi_attach(struct device *, struct device *, void *); void iwi_power(int, void *); @@ -301,7 +292,7 @@ iwi_attach(struct device *parent, struct device *self, void *aux) if (PCI_PRODUCT(pa->pa_id) >= PCI_PRODUCT_INTEL_PRO_WL_2915ABG_1) { /* set supported .11a rates */ - ic->ic_sup_rates[IEEE80211_MODE_11A] = iwi_rateset_11a; + ic->ic_sup_rates[IEEE80211_MODE_11A] = ieee80211_std_rateset_11a; /* set supported .11a channels */ for (i = 36; i <= 64; i += 4) { @@ -317,8 +308,8 @@ iwi_attach(struct device *parent, struct device *self, void *aux) } /* set supported .11b and .11g rates */ - ic->ic_sup_rates[IEEE80211_MODE_11B] = iwi_rateset_11b; - ic->ic_sup_rates[IEEE80211_MODE_11G] = iwi_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++) { |