summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorreyk <reyk@openbsd.org>2006-09-19 13:37:11 +0000
committerreyk <reyk@openbsd.org>2006-09-19 13:37:11 +0000
commit54af33d793e28c5b978f73e63fe2ed4e180f7590 (patch)
tree9b3dd1a7830686d87838b814d19fe7017c07b7ce /sys
parentuse the correct antenna mode settings and fix a bug in the tx (diff)
downloadwireguard-openbsd-54af33d793e28c5b978f73e63fe2ed4e180f7590.tar.xz
wireguard-openbsd-54af33d793e28c5b978f73e63fe2ed4e180f7590.zip
fix 11a/b antenna mode setup
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/ar5211.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/sys/dev/ic/ar5211.c b/sys/dev/ic/ar5211.c
index 0301c2fe351..b7d377807a2 100644
--- a/sys/dev/ic/ar5211.c
+++ b/sys/dev/ic/ar5211.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5211.c,v 1.26 2006/09/19 13:14:32 reyk Exp $ */
+/* $OpenBSD: ar5211.c,v 1.27 2006/09/19 13:37:11 reyk Exp $ */
/*
* Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -500,15 +500,10 @@ ar5k_ar5211_reset(struct ath_hal *hal, HAL_OPMODE op_mode, HAL_CHANNEL *channel,
AR5K_REG_MASKED_BITS(AR5K_AR5211_PHY(0x44),
hal->ah_antenna[ee_mode][0], 0xfffffc06);
- ant[0] = HAL_ANT_FIXED_A;
- ant[1] = HAL_ANT_FIXED_B;
-
- if (hal->ah_ant_diversity == AH_FALSE) {
- if (freq == AR5K_INI_RFGAIN_2GHZ)
- ant[0] = HAL_ANT_FIXED_B;
- else if (freq == AR5K_INI_RFGAIN_5GHZ)
- ant[1] = HAL_ANT_FIXED_A;
- }
+ if (freq == AR5K_INI_RFGAIN_2GHZ)
+ ant[0] = ant[1] = HAL_ANT_FIXED_B;
+ else
+ ant[0] = ant[1] = HAL_ANT_FIXED_A;
AR5K_REG_WRITE(AR5K_AR5211_PHY_ANT_SWITCH_TABLE_0,
hal->ah_antenna[ee_mode][ant[0]]);