D52066.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D52066.diff
View Options

	diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h
	--- a/sys/compat/linuxkpi/common/include/linux/pci.h
	+++ b/sys/compat/linuxkpi/common/include/linux/pci.h
	@@ -1445,6 +1445,9 @@
	return (lkpi_pci_get_device(vendor, device, odev));
	}

	+#define for_each_pci_dev(_pdev) \
	+ while ((_pdev = linuxkpi_pci_get_device(PCI_ANY_ID, PCI_ANY_ID, _pdev)) != NULL)
	+
	/* This is a FreeBSD extension so we can use bus_(). /
	static inline void
	linuxkpi_pcim_want_to_use_bus_functions(struct pci_dev *pdev)
	diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c
	--- a/sys/compat/linuxkpi/common/src/linux_pci.c
	+++ b/sys/compat/linuxkpi/common/src/linux_pci.c
	@@ -289,12 +289,18 @@
	{
	struct pci_dev pdev, found;

	- KASSERT(odev == NULL, ("%s: odev argument not yet supported\n", __func__));
	-
	found = NULL;
	spin_lock(&pci_lock);
	list_for_each_entry(pdev, &pci_devices, links) {
	- if (pdev->vendor == vendor && pdev->device == device) {
	+ /* Walk until we find odev. */
	+ if (odev != NULL) {
	+ if (pdev == odev)
	+ odev = NULL;
	+ continue;
	+ }
	+
	+ if ((pdev->vendor == vendor \|\| vendor == PCI_ANY_ID) &&
	+ (pdev->device == device \|\| device == PCI_ANY_ID)) {
	found = pdev;
	break;
	}