From owner-svn-src-all@FreeBSD.ORG  Sat Aug 11 22:25:29 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 203BB1065678;
	Sat, 11 Aug 2012 22:25:29 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0BA798FC08;
	Sat, 11 Aug 2012 22:25:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7BMPSJ0006143;
	Sat, 11 Aug 2012 22:25:28 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7BMPSvJ006140;
	Sat, 11 Aug 2012 22:25:28 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201208112225.q7BMPSvJ006140@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 11 Aug 2012 22:25:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239198 - head/sys/dev/ath
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Aug 2012 22:25:29 -0000

Author: adrian
Date: Sat Aug 11 22:25:28 2012
New Revision: 239198
URL: http://svn.freebsd.org/changeset/base/239198

Log:
  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.

Modified:
  head/sys/dev/ath/if_ath_tx.c

Modified: head/sys/dev/ath/if_ath_tx.c
==============================================================================
--- head/sys/dev/ath/if_ath_tx.c	Sat Aug 11 22:20:28 2012	(r239197)
+++ head/sys/dev/ath/if_ath_tx.c	Sat Aug 11 22:25:28 2012	(r239198)
@@ -120,7 +120,8 @@ static int ath_tx_action_frame_override_
 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));
 }
 
 /*