From owner-p4-projects@FreeBSD.ORG  Tue Jan 14 19:00:21 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 4B1DEB65; Tue, 14 Jan 2014 19:00:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CADB2B5C
 for <perforce@freebsd.org>; Tue, 14 Jan 2014 19:00:20 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AE94C1449
 for <perforce@freebsd.org>; Tue, 14 Jan 2014 19:00:20 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id s0EJ0K2i020416
 for <perforce@freebsd.org>; Tue, 14 Jan 2014 19:00:20 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.7/Submit) id s0EJ0K11020412
 for perforce@freebsd.org; Tue, 14 Jan 2014 19:00:20 GMT
 (envelope-from jhb@freebsd.org)
Date: Tue, 14 Jan 2014 19:00:20 GMT
Message-Id: <201401141900.s0EJ0K11020412@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1190026 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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, 14 Jan 2014 19:00:21 -0000

http://p4web.freebsd.org/@@1190026?ac=10

Change 1190026 by jhb@jhb_jhbbsd on 2014/01/14 19:00:04

	Catch up.

Affected files ...

.. //depot/projects/pci/sys/dev/alc/if_alc.c#7 edit

Differences ...

==== //depot/projects/pci/sys/dev/alc/if_alc.c#7 (text+ko) ====

@@ -841,9 +841,9 @@
 				device_printf(dev, "RCB %u bytes\n",
 				    sc->alc_rcb == DMA_CFG_RCB_64 ? 64 : 128);
 			state = ctl & PCIEM_LINK_CTL_ASPMC;
-			if (state & PCIEM_LINK_CTL_ASPMC_L0S)
+			if (state & PCIEM_LINK_ASPMC_L0S)
 				sc->alc_flags |= ALC_FLAG_L0S;
-			if (state & PCIEM_LINK_CTL_ASPMC_L1)
+			if (state & PCIEM_LINK_ASPMC_L1)
 				sc->alc_flags |= ALC_FLAG_L1S;
 			if (bootverbose)
 				device_printf(sc->alc_dev, "ASPM %s %s\n",