From owner-svn-src-all@FreeBSD.ORG  Sat Apr 16 12:46:47 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4577A106566C;
	Sat, 16 Apr 2011 12:46:47 +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 33CC48FC1A;
	Sat, 16 Apr 2011 12:46:47 +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 p3GCkljk005604;
	Sat, 16 Apr 2011 12:46:47 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3GCklOd005602;
	Sat, 16 Apr 2011 12:46:47 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201104161246.p3GCklOd005602@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 16 Apr 2011 12:46:47 +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: r220718 - head/sys/dev/ath/ath_hal/ar5416
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, 16 Apr 2011 12:46:47 -0000

Author: adrian
Date: Sat Apr 16 12:46:46 2011
New Revision: 220718
URL: http://svn.freebsd.org/changeset/base/220718

Log:
  Disable classic-style fast diversity on the AR5416 and later.
  
  Antenna diversity on the >= AR5416 is implemented differently than the
  AR5212 and previous chips. So for now, and not to confuse things, just
  disable it for now.

Modified:
  head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c	Sat Apr 16 12:45:09 2011	(r220717)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c	Sat Apr 16 12:46:46 2011	(r220718)
@@ -290,6 +290,8 @@ ar5416GetCapability(struct ath_hal *ah, 
 		    (ah->ah_macVersion == AR_XSREV_VERSION_OWL_PCIE) ||
 		    AR_SREV_SOWL(ah)) ?
 			HAL_OK : HAL_ENOTSUPP;
+	case HAL_CAP_DIVERSITY:		/* disable classic fast diversity */
+		return HAL_ENXIO;
 	default:
 		break;
 	}