From owner-svn-src-head@FreeBSD.ORG  Mon Apr 25 15:51:49 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 66CF71065678;
	Mon, 25 Apr 2011 15:51:49 +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 522128FC1E;
	Mon, 25 Apr 2011 15:51:49 +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 p3PFpn5G082487;
	Mon, 25 Apr 2011 15:51:49 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3PFpnoS082485;
	Mon, 25 Apr 2011 15:51:49 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201104251551.p3PFpnoS082485@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 25 Apr 2011 15:51:49 +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: r221019 - head/sys/dev/ath/ath_hal
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Apr 2011 15:51:49 -0000

Author: adrian
Date: Mon Apr 25 15:51:49 2011
New Revision: 221019
URL: http://svn.freebsd.org/changeset/base/221019

Log:
  Wrap the MIMO stuff in #ifdef AH_SUPPORT_AR5416, as the channel
  state doesn't have MIMO stuff in it by default.

Modified:
  head/sys/dev/ath/ath_hal/ah.c

Modified: head/sys/dev/ath/ath_hal/ah.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.c	Mon Apr 25 14:51:08 2011	(r221018)
+++ head/sys/dev/ath/ath_hal/ah.c	Mon Apr 25 15:51:49 2011	(r221019)
@@ -906,6 +906,7 @@ ath_hal_get_mimo_chan_noise(struct ath_h
     const struct ieee80211_channel *chan, int16_t *nf_ctl,
     int16_t *nf_ext)
 {
+#ifdef	AH_SUPPORT_AR5416
 	HAL_CHANNEL_INTERNAL *ichan;
 	int i;
 
@@ -960,6 +961,9 @@ ath_hal_get_mimo_chan_noise(struct ath_h
 		}
 		return 1;
 	}
+#else
+	return 0;
+#endif	/* AH_SUPPORT_AR5416 */
 }
 
 /*