summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Glocker <mglocker@cvs.openbsd.org>2007-07-07 21:17:27 +0000
committerMarcus Glocker <mglocker@cvs.openbsd.org>2007-07-07 21:17:27 +0000
commit73496d933775158f5a6147ef896c059945b356ee (patch)
treed76eee9299c3640846f8b30454d6650f09667b91
parentc0c0d347eb663b652336c98fccb231e1694f0bea (diff)
Make the scan command work, finally.
-rw-r--r--sys/dev/pcmcia/if_malo.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/pcmcia/if_malo.c b/sys/dev/pcmcia/if_malo.c
index 14f76b1dbb5..de695df2bc7 100644
--- a/sys/dev/pcmcia/if_malo.c
+++ b/sys/dev/pcmcia/if_malo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_malo.c,v 1.20 2007/06/30 12:08:57 mglocker Exp $ */
+/* $OpenBSD: if_malo.c,v 1.21 2007/07/07 21:17:26 mglocker Exp $ */
/*
* Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -593,9 +593,6 @@ cmalo_init(struct ifnet *ifp)
cmalo_cmd_set_snmp(sc, MALO_OID_RTSTRESH);
cmalo_cmd_set_snmp(sc, MALO_OID_SHORTRETRY);
cmalo_cmd_set_snmp(sc, MALO_OID_FRAGTRESH);
- cmalo_cmd_set_snmp(sc, MALO_OID_80211D);
-
- cmalo_cmd_set_80211d(sc);
cmalo_cmd_set_scan(sc);
@@ -1050,9 +1047,9 @@ cmalo_cmd_set_scan(struct malo_softc *sc)
body_rates = sc->sc_cmd + psize;
body_rates->type = htole16(MALO_TLV_TYPE_RATES);
body_rates->size =
- htole16(ic->ic_sup_rates[IEEE80211_MODE_11G].rs_nrates);
- bcopy(ic->ic_sup_rates[IEEE80211_MODE_11G].rs_rates, body_rates->data,
- ic->ic_sup_rates[IEEE80211_MODE_11G].rs_nrates);
+ htole16(ic->ic_sup_rates[IEEE80211_MODE_11B].rs_nrates);
+ bcopy(ic->ic_sup_rates[IEEE80211_MODE_11B].rs_rates, body_rates->data,
+ ic->ic_sup_rates[IEEE80211_MODE_11B].rs_nrates);
psize += (sizeof(*body_rates) - 1) + body_rates->size;
#if 0
body_numprobes = sc->sc_cmd + psize;