From owner-svn-src-projects@FreeBSD.ORG  Fri Aug 13 03:04:01 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3A95E10656A4;
	Fri, 13 Aug 2010 03:04:01 +0000 (UTC)
	(envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2A07E8FC0A;
	Fri, 13 Aug 2010 03:04:01 +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 o7D341HH074152;
	Fri, 13 Aug 2010 03:04:01 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7D341W8074150;
	Fri, 13 Aug 2010 03:04:01 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201008130304.o7D341W8074150@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Fri, 13 Aug 2010 03:04:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211254 - projects/ofed/head/sys/ofed/include/linux
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Aug 2010 03:04:01 -0000

Author: jeff
Date: Fri Aug 13 03:04:00 2010
New Revision: 211254
URL: http://svn.freebsd.org/changeset/base/211254

Log:
   - Correct the value of 'device' and add 'vendor' to the pci_dev structure.
  
  Sponsored by:	Isilon Systems, iX Systems, and Panasas.

Modified:
  projects/ofed/head/sys/ofed/include/linux/pci.h

Modified: projects/ofed/head/sys/ofed/include/linux/pci.h
==============================================================================
--- projects/ofed/head/sys/ofed/include/linux/pci.h	Fri Aug 13 03:03:36 2010	(r211253)
+++ projects/ofed/head/sys/ofed/include/linux/pci.h	Fri Aug 13 03:04:00 2010	(r211254)
@@ -108,6 +108,7 @@ struct pci_dev {
 	struct pci_driver	*pdrv;
 	uint64_t		dma_mask;
 	uint16_t		device;
+	uint16_t		vendor;
 	unsigned int		irq;
 };
 
@@ -377,7 +378,8 @@ linux_pci_attach(device_t dev)
 	pdev = device_get_softc(dev);
 	pdev->dev.parent = &linux_rootdev;
 	pdev->dev.bsddev = dev;
-	pdev->device = device_get_unit(dev);
+	pdev->device = id->device;
+	pdev->vendor = id->vendor;
 	pdev->dev.dma_mask = &pdev->dma_mask;
 	pdev->pdrv = pdrv;
 	kobject_init(&pdev->dev.kobj, &dev_ktype);