summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Glocker <mglocker@cvs.openbsd.org>2007-09-29 22:28:00 +0000
committerMarcus Glocker <mglocker@cvs.openbsd.org>2007-09-29 22:28:00 +0000
commitc3683a440564cd68d673d65fbcb808c6176926ad (patch)
tree81da4c05012940eae8a115629a8fa0756e00474d
parentbff7d0db0450b411bb5f9db0c7855465af37b17d (diff)
Fix two panic's on macppc. Allows me first network communication over
my PowerBook G4 internal BCM4306 device.
-rw-r--r--sys/dev/ic/bwi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index 2b2d9cfb0d6..c4aa82a660d 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bwi.c,v 1.50 2007/09/27 22:17:32 mglocker Exp $ */
+/* $OpenBSD: bwi.c,v 1.51 2007/09/29 22:27:59 mglocker Exp $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
@@ -7998,7 +7998,7 @@ bwi_encap(struct bwi_softc *sc, int idx, struct mbuf *m,
rs_rates[ic->ic_fixed_rate];
} else {
/* AMRR rate control */
- rate = ni->ni_rates.rs_rates[ni->ni_txrate];
+ rate = rate_fb = ni->ni_rates.rs_rates[ni->ni_txrate];
}
} else {
/* Fixed at 1Mbytes/s for mgt frames */
@@ -8303,7 +8303,7 @@ bwi_txeof(struct bwi_softc *sc)
if (tx_info & 0x30) /* XXX */
continue;
- _bwi_txeof(sc, tx_id);
+ _bwi_txeof(sc, letoh16(tx_id));
}
if ((ifp->if_flags & IFF_OACTIVE) == 0)