summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2007-01-24 17:56:25 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2007-01-24 17:56:25 +0000
commit9106ee01297ee6402dfd2a48a662174ba5c624e8 (patch)
tree5d35e146acdb9babc1653544aa441561899c162b /sys/dev
parent1d59f8cd13bb465b5a7eb88cbd77fc0089685156 (diff)
revert changes committed between r1.25 and 1.26.
this breaks some RT2560 adapters. pointed out by krw@ and Pierre Riteau.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/rt2560.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index a7ce7ab893c..68e84da2101 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2560.c,v 1.30 2007/01/03 18:16:43 claudio Exp $ */
+/* $OpenBSD: rt2560.c,v 1.31 2007/01/24 17:56:24 damien Exp $ */
/*-
* Copyright (c) 2005, 2006
@@ -2628,6 +2628,8 @@ 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);
@@ -2640,9 +2642,6 @@ 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);