From owner-svn-src-stable@FreeBSD.ORG  Fri Apr 16 09:08:20 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4208E106564A;
	Fri, 16 Apr 2010 09:08:20 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 321408FC2C;
	Fri, 16 Apr 2010 09:08:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3G98Kvq078015;
	Fri, 16 Apr 2010 09:08:20 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3G98KlZ078013;
	Fri, 16 Apr 2010 09:08:20 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201004160908.o3G98KlZ078013@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 16 Apr 2010 09:08:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206700 - stable/8/sys/dev/ath/ath_hal/ar5416
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Apr 2010 09:08:20 -0000

Author: rpaulo
Date: Fri Apr 16 09:08:19 2010
New Revision: 206700
URL: http://svn.freebsd.org/changeset/base/206700

Log:
  MFC r206420:
   Setup the correct RX/TX chainmask when we play with the antenna
   settings.
  
  Sponsored by:	iXsystems, inc

Modified:
  stable/8/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c
==============================================================================
--- stable/8/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c	Fri Apr 16 08:32:08 2010	(r206699)
+++ stable/8/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c	Fri Apr 16 09:08:19 2010	(r206700)
@@ -378,8 +378,8 @@ ar9285SetAntennaSwitch(struct ath_hal *a
 	case HAL_ANT_VARIABLE:
 		/* Restore original chainmask settings */
 		/* XXX */
-		ahp->ah_tx_chainmask = AR5416_DEFAULT_TXCHAINMASK;
-		ahp->ah_rx_chainmask = AR5416_DEFAULT_RXCHAINMASK;
+		ahp->ah_tx_chainmask = AR9285_DEFAULT_TXCHAINMASK;
+		ahp->ah_rx_chainmask = AR9285_DEFAULT_RXCHAINMASK;
 		break;
 	}
 	return AH_TRUE;