Author: ivadasz Date: Mon Sep 19 22:23:46 2016 New Revision: 306005 URL: https://svnweb.freebsd.org/changeset/base/306005
Log: [iwm] Use IWM_DEFAULT_SCAN_CHANNELS define as default for sc_capa_n_scan_channels. Approved by: adrian (mentor) Obtained from: Linux iwlwifi Differential Revision: https://reviews.freebsd.org/D7938 Modified: head/sys/dev/iwm/if_iwm.c head/sys/dev/iwm/if_iwmreg.h Modified: head/sys/dev/iwm/if_iwm.c ============================================================================== --- head/sys/dev/iwm/if_iwm.c Mon Sep 19 22:20:46 2016 (r306004) +++ head/sys/dev/iwm/if_iwm.c Mon Sep 19 22:23:46 2016 (r306005) @@ -442,6 +442,8 @@ iwm_firmware_store_section(struct iwm_so 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 @@ iwm_read_firmware(struct iwm_softc *sc, /* (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)); Modified: head/sys/dev/iwm/if_iwmreg.h ============================================================================== --- head/sys/dev/iwm/if_iwmreg.h Mon Sep 19 22:20:46 2016 (r306004) +++ head/sys/dev/iwm/if_iwmreg.h Mon Sep 19 22:23:46 2016 (r306005) @@ -4799,9 +4799,6 @@ struct iwm_ssid_ie { #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. _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
