From owner-svn-src-all@FreeBSD.ORG  Fri Mar 23 21:19:07 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E9DAD1065670;
	Fri, 23 Mar 2012 21:19:07 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BB1368FC18;
	Fri, 23 Mar 2012 21:19:07 +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 q2NLJ7p3094755;
	Fri, 23 Mar 2012 21:19:07 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2NLJ7mE094753;
	Fri, 23 Mar 2012 21:19:07 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201203232119.q2NLJ7mE094753@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 23 Mar 2012 21:19:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233398 - in stable/9/sys: dev/oce i386/conf
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: Fri, 23 Mar 2012 21:19:08 -0000

Author: jhb
Date: Fri Mar 23 21:19:07 2012
New Revision: 233398
URL: http://svn.freebsd.org/changeset/base/233398

Log:
  MFC 232470:
  Use pci_find_cap() instead of pci_find_extcap() to locate PCI
  find capabilities as the latter API is deprecated for this purpose.

Modified:
  stable/9/sys/dev/oce/oce_hw.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)

Modified: stable/9/sys/dev/oce/oce_hw.c
==============================================================================
--- stable/9/sys/dev/oce/oce_hw.c	Fri Mar 23 21:07:10 2012	(r233397)
+++ stable/9/sys/dev/oce/oce_hw.c	Fri Mar 23 21:19:07 2012	(r233398)
@@ -203,12 +203,12 @@ void oce_get_pci_capabilities(POCE_SOFTC
 {
 	uint32_t val;
 
-	if (pci_find_extcap(sc->dev, PCIY_PCIX, &val) == 0) {
+	if (pci_find_cap(sc->dev, PCIY_PCIX, &val) == 0) {
 		if (val != 0) 
 			sc->flags |= OCE_FLAGS_PCIX;
 	}
 
-	if (pci_find_extcap(sc->dev, PCIY_EXPRESS, &val) == 0) {
+	if (pci_find_cap(sc->dev, PCIY_EXPRESS, &val) == 0) {
 		if (val != 0) {
 			uint16_t link_status =
 			    pci_read_config(sc->dev, val + 0x12, 2);
@@ -219,12 +219,12 @@ void oce_get_pci_capabilities(POCE_SOFTC
 		}
 	}
 
-	if (pci_find_extcap(sc->dev, PCIY_MSI, &val) == 0) {
+	if (pci_find_cap(sc->dev, PCIY_MSI, &val) == 0) {
 		if (val != 0)
 			sc->flags |= OCE_FLAGS_MSI_CAPABLE;
 	}
 
-	if (pci_find_extcap(sc->dev, PCIY_MSIX, &val) == 0) {
+	if (pci_find_cap(sc->dev, PCIY_MSIX, &val) == 0) {
 		if (val != 0) {
 			val = pci_msix_count(sc->dev);
 			sc->flags |= OCE_FLAGS_MSIX_CAPABLE;