From 6468b2baa57658bf45c17918f707587241dde50e Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Tue, 25 Jan 2011 05:47:50 +0000 Subject: [PATCH] Bring over a fix from ath9k - zero some of the TX descriptors for Kite/AR9285. Kite doesn't have per-chain control (it has one chain) or antenna control; so don't try to set those descriptor entries. --- sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c b/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c index 8a8dbef4175..156b1a79510 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c +++ b/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c @@ -230,6 +230,13 @@ ar5416SetupTxDesc(struct ath_hal *ah, struct ath_desc *ds, ads->ds_ctl2 |= SM(rtsctsDuration, AR_BurstDur); ads->ds_ctl7 |= (rtsctsRate << AR_RTSCTSRate_S); } + + if (AR_SREV_KITE(ah)) { + ads->ds_ctl8 = 0; + ads->ds_ctl9 = 0; + ads->ds_ctl10 = 0; + ads->ds_ctl11 = 0; + } return AH_TRUE; #undef RTSCTS } @@ -417,6 +424,13 @@ ar5416SetupFirstTxDesc(struct ath_hal *ah, struct ath_desc *ds, | (flags & HAL_TXDESC_RTSENA ? AR_RTSEnable : 0); ads->ds_ctl2 |= SM(rtsctsDuration, AR_BurstDur); } + + if (AR_SREV_KITE(ah)) { + ads->ds_ctl8 = 0; + ads->ds_ctl9 = 0; + ads->ds_ctl10 = 0; + ads->ds_ctl11 = 0; + } return AH_TRUE; #undef RTSCTS