Author: eadler
Date: Thu Mar 1 04:53:54 2018
New Revision: 330152
URL: https://svnweb.freebsd.org/changeset/base/330152
Log:
MFC r306005:
[iwm] Use IWM_DEFAULT_SCAN_CHANNELS define as default for
sc_capa_n_scan_channels.
Modified:
stable/11/sys/dev/iwm/if_iwm.c
stable/11/sys/dev/iwm/if_iwmreg.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/iwm/if_iwm.c
==============================================================================
--- stable/11/sys/dev/iwm/if_iwm.c Thu Mar 1 04:52:23 2018
(r330151)
+++ stable/11/sys/dev/iwm/if_iwm.c Thu Mar 1 04:53:54 2018
(r330152)
@@ -442,6 +442,8 @@ iwm_firmware_store_section(struct iwm_softc *sc,
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, enum iwm_ucode
/* (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: stable/11/sys/dev/iwm/if_iwmreg.h
==============================================================================
--- stable/11/sys/dev/iwm/if_iwmreg.h Thu Mar 1 04:52:23 2018
(r330151)
+++ stable/11/sys/dev/iwm/if_iwmreg.h Thu Mar 1 04:53:54 2018
(r330152)
@@ -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-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
