D49759.id153457.diff
No OneTemporary
Actions

Size

688 B

Referenced Files

None

Subscribers

None

D49759.id153457.diff
View Options

	diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c
	--- a/sys/dev/iwx/if_iwx.c
	+++ b/sys/dev/iwx/if_iwx.c
	@@ -10022,12 +10022,13 @@
	const struct iwx_device_cfg *
	iwx_find_device_cfg(struct iwx_softc *sc)
	{
	- uint16_t mac_type, rf_type;
	+ uint32_t sreg;
	+ uint16_t sdev_id, mac_type, rf_type;
	uint8_t mac_step, cdb, jacket, rf_id, no_160, cores;
	int i;
	- uint16_t sdev_id;

	- sdev_id = pci_get_device(sc->sc_dev);
	+ sreg = pci_read_config(sc->sc_dev, PCIR_SUBVEND_0, sizeof(uint32_t));
	+ sdev_id = (sreg >> 16) & 0xffff;
	mac_type = IWX_CSR_HW_REV_TYPE(sc->sc_hw_rev);
	mac_step = IWX_CSR_HW_REV_STEP(sc->sc_hw_rev << 2);
	rf_type = IWX_CSR_HW_RFID_TYPE(sc->sc_hw_rf_id);