From owner-p4-projects@FreeBSD.ORG  Tue Apr 29 22:28:56 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 302AD1065673; Tue, 29 Apr 2008 22:28:56 +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 D9EE5106566C
	for <perforce@freebsd.org>; Tue, 29 Apr 2008 22:28:55 +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 CA4578FC15
	for <perforce@freebsd.org>; Tue, 29 Apr 2008 22:28:55 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3TMStdn058251
	for <perforce@freebsd.org>; Tue, 29 Apr 2008 22:28:55 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3TMStFW058249
	for perforce@freebsd.org; Tue, 29 Apr 2008 22:28:55 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 29 Apr 2008 22:28:55 GMT
Message-Id: <200804292228.m3TMStFW058249@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 140904 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: Tue, 29 Apr 2008 22:28:56 -0000

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

Change 140904 by sam@sam_ebb on 2008/04/29 22:28:14

	re-enable HT support; work will happen in the branch

Affected files ...

.. //depot/projects/vap/sys/dev/iwn/if_iwn.c#14 edit

Differences ...

==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#14 (text+kox) ====

@@ -390,7 +390,7 @@
 #endif
 		| IEEE80211_C_WME		/* WME */
 		;
-#if 0
+
 	/* XXX disable until HT channel setup works */
 	ic->ic_htcaps =
 		  IEEE80211_HTCAP_SMPS_ENA	/* SM PS mode enabled */
@@ -404,7 +404,7 @@
 		| IEEE80211_HTC_AMPDU		/* tx A-MPDU */
 		| IEEE80211_HTC_AMSDU		/* tx A-MSDU */
 		;
-#endif
+
 	/* read supported channels and MAC address from EEPROM */
 	iwn_read_eeprom(sc);