summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2012-08-11 22:25:28 +0000
committeradrian <adrian@FreeBSD.org>2012-08-11 22:25:28 +0000
commitac90f5100df8198351fdd7a46bd165887b02e30c (patch)
tree2523ed146196c25dc21de53134433133b5431fb4 /sys/dev
parent95f393e2ff9381a0e1223430f7af46531ea40c57 (diff)
downloadFreeBSD-src-ac90f5100df8198351fdd7a46bd165887b02e30c.zip
FreeBSD-src-ac90f5100df8198351fdd7a46bd165887b02e30c.tar.gz
Add the AR9300 HAL ID in to the 11n check routine.
I was having TX hang issues, which I root caused to having the legacy ath_hal_setupxtxdesc() called, rather than the 11n rate scenario setup code. This meant that rate control information wasn't being put into frames, causing the MAC to stall/hang.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ath/if_ath_tx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/ath/if_ath_tx.c b/sys/dev/ath/if_ath_tx.c
index 8d7910d..fbf5c92 100644
--- a/sys/dev/ath/if_ath_tx.c
+++ b/sys/dev/ath/if_ath_tx.c
@@ -120,7 +120,8 @@ static int ath_tx_action_frame_override_queue(struct ath_softc *sc,
static inline int
ath_tx_is_11n(struct ath_softc *sc)
{
- return (sc->sc_ah->ah_magic == 0x20065416);
+ return ((sc->sc_ah->ah_magic == 0x20065416) ||
+ (sc->sc_ah->ah_magic == 0x19741014));
}
/*
OpenPOWER on IntegriCloud