diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2017-01-29 09:41:37 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2017-01-29 09:41:37 +0000 |
| commit | 28a2cec79988810d5357a71c0b2afdf785c2d8c5 (patch) | |
| tree | 44131108d98d54d5b09684574c2784ef93828cfa /sys/dev/pci/if_iwm.c | |
| parent | 322f4ac848fe5ebf2d97010adf374f2f11fc48ad (diff) | |
In iwm(4), remove old deprecated scan API definitions which have been
unused since the upgrade to version 16 firmware.
Also, matching the iwlwifi code, use IWM_DEFAULT_SCAN_CHANNELS (== 40)
instead of IWM_MAX_NUM_SCAN_CHANNELS (== 36) as default value for
sc->sc_capa_n_scan_channels.
Mostly matches the header-file changes in Linux iwlwifi git
commit 1f9403863c080478ad78247c89b018e95bdfb027.
Patch by Imre Vadasz.
Diffstat (limited to 'sys/dev/pci/if_iwm.c')
| -rw-r--r-- | sys/dev/pci/if_iwm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index 5b4d4c3992e..9a02a3fad83 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.158 2017/01/22 10:17:38 dlg Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.159 2017/01/29 09:41:36 stsp Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh <info@genua.de> @@ -525,6 +525,8 @@ iwm_firmware_store_section(struct iwm_softc *sc, enum iwm_ucode_type type, return 0; } +#define IWM_DEFAULT_SCAN_CHANNELS 40 + struct iwm_tlv_calib_data { uint32_t ucode_type; struct iwm_tlv_calib_ctrl calib; @@ -588,7 +590,7 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode_type ucode_type) } 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)); @@ -6636,7 +6638,6 @@ iwm_notif_intr(struct iwm_softc *sc) case IWM_PHY_CONTEXT_CMD: case IWM_BINDING_CONTEXT_CMD: case IWM_TIME_EVENT_CMD: - case IWM_SCAN_REQUEST_CMD: case IWM_WIDE_ID(IWM_ALWAYS_LONG_GROUP, IWM_SCAN_CFG_CMD): case IWM_WIDE_ID(IWM_ALWAYS_LONG_GROUP, IWM_SCAN_REQ_UMAC): case IWM_SCAN_OFFLOAD_REQUEST_CMD: |