From owner-svn-src-all@FreeBSD.ORG  Tue Nov  8 18:37:52 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 E594F106564A;
	Tue,  8 Nov 2011 18:37:52 +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 D58C88FC12;
	Tue,  8 Nov 2011 18:37:52 +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 pA8IbqBR043574;
	Tue, 8 Nov 2011 18:37:52 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA8IbqTp043572;
	Tue, 8 Nov 2011 18:37:52 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201111081837.pA8IbqTp043572@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 8 Nov 2011 18:37:52 +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: r227350 - 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: Tue, 08 Nov 2011 18:37:53 -0000

Author: adrian
Date: Tue Nov  8 18:37:52 2011
New Revision: 227350
URL: http://svn.freebsd.org/changeset/base/227350

Log:
  Conditionally compile the PCI latency workaround; I think it's
  only required for some earlier NICs.

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

Modified: head/sys/dev/ath/if_ath_pci.c
==============================================================================
--- head/sys/dev/ath/if_ath_pci.c	Tue Nov  8 18:36:59 2011	(r227349)
+++ head/sys/dev/ath/if_ath_pci.c	Tue Nov  8 18:37:52 2011	(r227350)
@@ -78,8 +78,10 @@ struct ath_pci_softc {
 static void
 ath_pci_setup(device_t dev)
 {
+#ifdef	ATH_PCI_LATENCY_WAR
 	/* Override the system latency timer */
 	pci_write_config(dev, PCIR_LATTIMER, 0x80, 1);
+#endif
 
 	/* If a PCI NIC, force wakeup */
 #ifdef	ATH_PCI_WAKEUP_WAR