D52364.id.diff
No OneTemporary
Actions

Size

936 B

Referenced Files

None

Subscribers

None

D52364.id.diff
View Options

	diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
	--- a/sys/cam/cam_ccb.h
	+++ b/sys/cam/cam_ccb.h
	@@ -649,7 +649,7 @@
	uint8_t bus;
	uint8_t slot;
	uint8_t function;
	- uint8_t extra;
	+ uint8_t progif;
	char dev_name[NVME_DEV_NAME_LEN]; /* nvme controller dev name for this device */
	};
	_Static_assert(sizeof(struct ccb_pathinq_settings_nvme) == 64,
	diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c
	--- a/sys/dev/nvme/nvme_sim.c
	+++ b/sys/dev/nvme/nvme_sim.c
	@@ -203,7 +203,7 @@
	cpi->xport_specific.nvme.bus = pci_get_bus(dev);
	cpi->xport_specific.nvme.slot = pci_get_slot(dev);
	cpi->xport_specific.nvme.function = pci_get_function(dev);
	- cpi->xport_specific.nvme.extra = 0;
	+ cpi->xport_specific.nvme.progif = pci_get_progif(dev);
	strlcpy(cpi->xport_specific.nvme.dev_name, device_get_nameunit(dev),
	sizeof(cpi->xport_specific.nvme.dev_name));
	cpi->hba_vendor = pci_get_vendor(dev);