D60074.diff
No OneTemporary
Actions

Size

1000 B

Referenced Files

None

Subscribers

None

D60074.diff
View Options

	diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c
	--- a/sys/dev/iwm/if_iwm.c
	+++ b/sys/dev/iwm/if_iwm.c
	@@ -2247,6 +2247,12 @@

	data->n_hw_addrs = iwm_get_n_hw_addrs(sc, nvm_sw);

	+ data->calib_version = 255; /* TODO:
	+ this value will prevent some checks from
	+ failing, we need to check if this
	+ field is still needed, and if it does,
	+ where is it in the NVM */
	+
	if (sc->cfg->device_family >= IWM_DEVICE_FAMILY_8000) {
	/* TODO: use IWL_NVM_EXT */
	uint16_t lar_offset = data->nvm_version < 0xE39 ?
	diff --git a/sys/dev/iwm/if_iwmvar.h b/sys/dev/iwm/if_iwmvar.h
	--- a/sys/dev/iwm/if_iwmvar.h
	+++ b/sys/dev/iwm/if_iwmvar.h
	@@ -195,6 +195,14 @@
	int n_hw_addrs;
	uint8_t hw_addr[IEEE80211_ADDR_LEN];

	+ uint8_t calib_version;
	+ uint16_t calib_voltage;
	+
	+ uint16_t raw_temperature;
	+ uint16_t kelvin_temperature;
	+ uint16_t kelvin_voltage;
	+ uint16_t xtal_calib[2];
	+
	int sku_cap_band_24GHz_enable;
	int sku_cap_band_52GHz_enable;
	int sku_cap_11n_enable;