D7938.id20505.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7938.id20505.diff
View Options

	Index: head/sys/dev/iwm/if_iwm.c
	===================================================================
	--- head/sys/dev/iwm/if_iwm.c
	+++ head/sys/dev/iwm/if_iwm.c
	@@ -442,6 +442,8 @@
	return 0;
	}

	+#define IWM_DEFAULT_SCAN_CHANNELS 40
	+
	/* iwlwifi: iwl-drv.c */
	struct iwm_tlv_calib_data {
	uint32_t ucode_type;
	@@ -518,7 +520,7 @@

	/* (Re-)Initialize default values. */
	sc->sc_capaflags = 0;
	- sc->sc_capa_n_scan_channels = IWM_MAX_NUM_SCAN_CHANNELS;
	+ sc->sc_capa_n_scan_channels = IWM_DEFAULT_SCAN_CHANNELS;
	memset(sc->sc_enabled_capa, 0, sizeof(sc->sc_enabled_capa));
	memset(sc->sc_fw_mcc, 0, sizeof(sc->sc_fw_mcc));

	Index: head/sys/dev/iwm/if_iwmreg.h
	===================================================================
	--- head/sys/dev/iwm/if_iwmreg.h
	+++ head/sys/dev/iwm/if_iwmreg.h
	@@ -4799,9 +4799,6 @@
	#define IWM_FAST_SCHED_SCAN_ITERATIONS 3
	#define IWM_MAX_SCHED_SCAN_PLANS 2

	-/* Maximal number of channels to scan */
	-#define IWM_MAX_NUM_SCAN_CHANNELS 0x24
	-
	/**
	* iwm_scan_schedule_lmac - schedule of scan offload
	* @delay: delay between iterations, in seconds.