Index: contrib/zlib-ng =================================================================== --- contrib/zlib-ng +++ contrib/zlib-ng @@ -1 +1 @@ -Subproject commit 30c89988e2399e8da18adedb4ba666e08f078db8 +Subproject commit 450dcb71e49892548fc3098125a7f060be494f7f Index: sys/compat/linuxkpi/common/include/linux/pci.h =================================================================== --- sys/compat/linuxkpi/common/include/linux/pci.h +++ sys/compat/linuxkpi/common/include/linux/pci.h @@ -261,6 +261,7 @@ struct pci_driver *pdrv; struct pci_bus *bus; struct pci_dev *root; + char *path_name; uint16_t device; uint16_t vendor; uint16_t subsystem_vendor; @@ -378,8 +379,7 @@ static inline const char * pci_name(struct pci_dev *d) { - - return device_get_desc(d->dev.bsddev); + return d->path_name; } static inline void * Index: sys/compat/linuxkpi/common/src/linux_pci.c =================================================================== --- sys/compat/linuxkpi/common/src/linux_pci.c +++ sys/compat/linuxkpi/common/src/linux_pci.c @@ -277,6 +277,8 @@ pdev->subsystem_device = pci_get_subdevice(dev); pdev->class = pci_get_class(dev); pdev->revision = pci_get_revid(dev); + pdev->path_name = kasprintf(GFP_KERNEL, "%04d:%d:%d.%d", \ + pci_get_domain(dev), pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev)); pdev->bus = malloc(sizeof(*pdev->bus), M_DEVBUF, M_WAITOK | M_ZERO); pdev->bus->self = pdev; pdev->bus->number = pci_get_bus(dev); @@ -302,6 +304,7 @@ if (pdev->root != NULL) pci_dev_put(pdev->root); free(pdev->bus, M_DEVBUF); + kfree(pdev->path_name); free(pdev, M_DEVBUF); }