D7945.1775550023.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7945.1775550023.diff
View Options

	Index: sys/dev/iwm/if_iwm.c
	===================================================================
	--- sys/dev/iwm/if_iwm.c
	+++ sys/dev/iwm/if_iwm.c
	@@ -441,7 +441,6 @@
	fwone->fws_len = dlen - sizeof(uint32_t);

	fws->fw_count++;
	- fws->fw_totlen += fwone->fws_len;

	return 0;
	}
	@@ -2177,11 +2176,6 @@
	memcpy(data->nvm_ch_flags, &regulatory[IWM_NVM_CHANNELS_8000],
	IWM_NUM_CHANNELS_8000 * sizeof(uint16_t));
	}
	- 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 */

	return 0;
	}
	Index: sys/dev/iwm/if_iwmvar.h
	===================================================================
	--- sys/dev/iwm/if_iwmvar.h
	+++ sys/dev/iwm/if_iwmvar.h
	@@ -170,7 +170,6 @@
	uint32_t fws_len;
	uint32_t fws_devoff;
	} fw_sect[IWM_UCODE_SECT_MAX];
	- size_t fw_totlen;
	int fw_count;
	} fw_sects[IWM_UCODE_TYPE_MAX];
	};
	@@ -179,14 +178,6 @@
	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;