From owner-svn-src-all@FreeBSD.ORG  Thu Feb 17 17:31:37 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 F36691065672;
	Thu, 17 Feb 2011 17:31:36 +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 E12F08FC0A;
	Thu, 17 Feb 2011 17:31:36 +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 p1HHVa8b020296;
	Thu, 17 Feb 2011 17:31:36 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1HHVaYe020294;
	Thu, 17 Feb 2011 17:31:36 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201102171731.p1HHVaYe020294@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 17 Feb 2011 17:31:36 +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: r218778 - head/sys/dev/ath
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, 17 Feb 2011 17:31:37 -0000

Author: adrian
Date: Thu Feb 17 17:31:36 2011
New Revision: 218778
URL: http://svn.freebsd.org/changeset/base/218778

Log:
  Disable short-GI in 20mhz mode - the hardware doesn't support this.

Modified:
  head/sys/dev/ath/if_ath.c

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Thu Feb 17 17:03:56 2011	(r218777)
+++ head/sys/dev/ath/if_ath.c	Thu Feb 17 17:31:36 2011	(r218778)
@@ -635,7 +635,10 @@ ath_attach(u_int16_t devid, struct ath_s
 			    | IEEE80211_HTC_AMPDU		/* A-MPDU tx/rx */
 			    | IEEE80211_HTC_AMSDU		/* A-MSDU tx/rx */
 			    | IEEE80211_HTCAP_MAXAMSDU_3839	/* max A-MSDU length */
+		/* At the present time, the hardware doesn't support short-GI in 20mhz mode */
+#if 0
 			    | IEEE80211_HTCAP_SHORTGI20		/* short GI in 20MHz */
+#endif
 			    | IEEE80211_HTCAP_SMPS_OFF;		/* SM power save off */
 			;