From owner-svn-src-all@FreeBSD.ORG  Thu Jan  5 17:28:06 2012
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 58FCD106566C;
	Thu,  5 Jan 2012 17:28:06 +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 480DD8FC14;
	Thu,  5 Jan 2012 17:28:06 +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 q05HS6Gi046483;
	Thu, 5 Jan 2012 17:28:06 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q05HS6vo046481;
	Thu, 5 Jan 2012 17:28:06 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201201051728.q05HS6vo046481@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 5 Jan 2012 17:28:06 +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: r229605 - head/sys/ia64/conf
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: Thu, 05 Jan 2012 17:28:06 -0000

Author: adrian
Date: Thu Jan  5 17:28:05 2012
New Revision: 229605
URL: http://svn.freebsd.org/changeset/base/229605

Log:
  Flip on IEEE80211_SUPPORT_MESH and AH_SUPPORT_AR5416, the
  wlan and ath modules respectively assume this is set.
  
  Pointy hat to:	adrian

Modified:
  head/sys/ia64/conf/GENERIC

Modified: head/sys/ia64/conf/GENERIC
==============================================================================
--- head/sys/ia64/conf/GENERIC	Thu Jan  5 17:22:32 2012	(r229604)
+++ head/sys/ia64/conf/GENERIC	Thu Jan  5 17:28:05 2012	(r229605)
@@ -180,6 +180,15 @@ device		uslcom		# SI Labs CP2101/CP2102 
 device		uvisor		# Visor and Palm devices
 device		uvscom		# USB serial support for DDI pocket's PHS
 
+# Wireless NIC cards.
+# The wlan(4) module assumes this, so just define it so it
+# at least correctly loads.
+options		IEEE80211_SUPPORT_MESH
+
+# The ath(4) and ath_hal(4) code requires this.  The module currently
+# builds everything including AR5416 (and later 11n NIC) support.
+options		AH_SUPPORT_AR5416
+
 # FireWire support
 device		fwip		# IP over FireWire (RFC 2734,3146)
 # sbp(4) works for some systems but causes boot failure on others