From 69efac96c355ab5524a8322cff70c2bb1fb2a02e Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Tue, 15 Feb 2011 13:29:52 +0000 Subject: [PATCH] Disable flipping antennas for AR9280. Flipping antennas when doing 11n would cause all kinds of strange issues. Just don't do it for now and when it comes time to do it, don't do it here. --- sys/dev/ath/ath_hal/ar9002/ar9280_attach.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c b/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c index 80281d8c629..243ca344963 100644 --- a/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c +++ b/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c @@ -705,11 +705,18 @@ ar9280FillCapabilityInfo(struct ath_hal *ah) return AH_TRUE; } +/* + * This has been disabled - having the HAL flip chainmasks on/off + * when attempting to implement 11n disrupts things. For now, just + * leave this flipped off and worry about implementing TX diversity + * for legacy and MCS0-7 when 11n is fully functioning. + */ HAL_BOOL ar9280SetAntennaSwitch(struct ath_hal *ah, HAL_ANT_SETTING settings) { #define ANTENNA0_CHAINMASK 0x1 #define ANTENNA1_CHAINMASK 0x2 +#if 0 struct ath_hal_5416 *ahp = AH5416(ah); /* Antenna selection is done by setting the tx/rx chainmasks approp. */ @@ -736,6 +743,7 @@ ar9280SetAntennaSwitch(struct ath_hal *ah, HAL_ANT_SETTING settings) HALDEBUG(ah, HAL_DEBUG_ANY, "%s: settings=%d, tx/rx chainmask=%d/%d\n", __func__, settings, ahp->ah_tx_chainmask, ahp->ah_rx_chainmask); +#endif return AH_TRUE; #undef ANTENNA0_CHAINMASK #undef ANTENNA1_CHAINMASK