summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Glocker <mglocker@cvs.openbsd.org>2006-12-08 00:04:11 +0000
committerMarcus Glocker <mglocker@cvs.openbsd.org>2006-12-08 00:04:11 +0000
commit8964fd5d79b9324ab13b5b6539fc3e73a41f42de (patch)
tree60dbb858f86f8093fa05b29c7cbbef5ab30652cc
parentb091409cfbca378c7c1f1513b85dfc9acd9ed6a2 (diff)
If we receive a rate of 0 from the AMRR rate adaption code, set the
TX rate to a minimum value of 1Mbit/s instead of doing a panic(). We don't know yet how the rate of 0 is produced in some conditions. ok claudio@
-rw-r--r--sys/dev/ic/acx111.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/ic/acx111.c b/sys/dev/ic/acx111.c
index 3b8eba8c696..16ade568c21 100644
--- a/sys/dev/ic/acx111.c
+++ b/sys/dev/ic/acx111.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acx111.c,v 1.13 2006/11/26 17:20:33 jsg Exp $ */
+/* $OpenBSD: acx111.c,v 1.14 2006/12/08 00:04:10 mglocker Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -456,7 +456,8 @@ acx111_set_fw_txdesc_rate(struct acx_softc *sc, struct acx_txbuf *tx_buf,
rate = acx111_rate_map[rate0];
if (rate == 0)
- panic("no rate map for %d\n", rate0);
+ /* set rate to 1Mbit/s if rate was zero */
+ rate = acx111_rate_map[2];
FW_TXDESC_SETFIELD_2(sc, tx_buf, u.r2.rate111, rate);
}