From owner-p4-projects@FreeBSD.ORG  Sun Sep  7 22:14:46 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 668631065683; Sun,  7 Sep 2008 22:14:46 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 29FE6106567D
	for <perforce@freebsd.org>; Sun,  7 Sep 2008 22:14:46 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 29A0C8FC48
	for <perforce@freebsd.org>; Sun,  7 Sep 2008 22:14:46 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m87MEkDa030840
	for <perforce@freebsd.org>; Sun, 7 Sep 2008 22:14:46 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m87MEjj3030838
	for perforce@freebsd.org; Sun, 7 Sep 2008 22:14:45 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 7 Sep 2008 22:14:45 GMT
Message-Id: <200809072214.m87MEjj3030838@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 149392 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Sep 2008 22:14:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=149392

Change 149392 by sam@sam_ebb on 2008/09/07 22:13:52

	hack a check for building against old hal versions

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#92 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#92 (text+ko) ====

@@ -607,6 +607,7 @@
 	wmodes = ath_hal_getwirelessmodes(ah, ic->ic_regdomain.country);
 	if (wmodes & (HAL_MODE_108G|HAL_MODE_TURBO))
 		ic->ic_caps |= IEEE80211_C_TURBOP;
+#if HAL_ABI_VERSION > 0x06102600	/* XXX not exact but close enough */
 	if (wmodes & HAL_MODE_HT20) {
 		/* XXX no capabilities for short GI */
 		ic->ic_htcaps |= IEEE80211_HTC_HT;
@@ -616,6 +617,7 @@
 			ic->ic_htcaps |= IEEE80211_HTCAP_SHORTGI40;
 		}
 	}
+#endif
 
 	/*
 	 * Indicate we need the 802.11 header padded to a