summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2006-11-22 20:54:57 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2006-11-22 20:54:57 +0000
commit17376ae9d5dd25c038de6666a3c1ce1d6471e971 (patch)
tree42a49823ccc74675f6b60e522176a014db4b6f3b
parent49a70c823f16381dfd925eb5b6948ebb1f9c78b0 (diff)
don't write to BBP before it is ready and fully initialized
-> move rt2560_set{tx,rx}antenna() after rt2560_bbp_init(). from <sephe at dragonflybsd dot org>
-rw-r--r--sys/dev/ic/rt2560.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index 714d1621e16..f6e4c23e8e3 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2560.c,v 1.25 2006/11/13 20:06:38 damien Exp $ */
+/* $OpenBSD: rt2560.c,v 1.26 2006/11/22 20:54:56 damien Exp $ */
/*-
* Copyright (c) 2005, 2006
@@ -2630,8 +2630,6 @@ rt2560_init(struct ifnet *ifp)
/* set basic rate set (will be updated later) */
RAL_WRITE(sc, RT2560_ARSP_PLCP_1, 0x153);
- rt2560_set_txantenna(sc, 1);
- rt2560_set_rxantenna(sc, 1);
rt2560_set_slottime(sc);
rt2560_update_plcp(sc);
rt2560_update_led(sc, 0, 0);
@@ -2644,6 +2642,9 @@ rt2560_init(struct ifnet *ifp)
return EIO;
}
+ rt2560_set_txantenna(sc, 1);
+ rt2560_set_rxantenna(sc, 1);
+
/* set default BSS channel */
ic->ic_bss->ni_chan = ic->ic_ibss_chan;
rt2560_set_chan(sc, ic->ic_bss->ni_chan);