aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/iwm
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2019-11-07 23:37:30 +0000
committerMark Johnston <markj@FreeBSD.org>2019-11-07 23:37:30 +0000
commitc3bfecf3df3e3899fe77fd6b5622f22fdf50c95f (patch)
tree6f9efc8d791e638cff448e8da7109734a5aa0664 /sys/dev/iwm
parent1f0976dc58bb0da269dcdf3fdbf451cf1f98adce (diff)
Notes
Diffstat (limited to 'sys/dev/iwm')
-rw-r--r--sys/dev/iwm/if_iwm.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c
index 983ebe1a8ab8..e8c37d062f36 100644
--- a/sys/dev/iwm/if_iwm.c
+++ b/sys/dev/iwm/if_iwm.c
@@ -3002,6 +3002,15 @@ iwm_run_init_mvm_ucode(struct iwm_softc *sc, int justnvm)
goto error;
}
+ if (sc->cfg->device_family < IWM_DEVICE_FAMILY_8000) {
+ ret = iwm_send_bt_init_conf(sc);
+ if (ret) {
+ device_printf(sc->sc_dev,
+ "failed to send bt coex configuration: %d\n", ret);
+ goto error;
+ }
+ }
+
if (justnvm) {
/* Read nvm */
ret = iwm_nvm_init(sc);
@@ -3013,13 +3022,6 @@ iwm_run_init_mvm_ucode(struct iwm_softc *sc, int justnvm)
goto error;
}
- ret = iwm_send_bt_init_conf(sc);
- if (ret) {
- device_printf(sc->sc_dev,
- "failed to send bt coex configuration: %d\n", ret);
- goto error;
- }
-
/* Send TX valid antennas before triggering calibrations */
ret = iwm_send_tx_ant_cfg(sc, iwm_mvm_get_valid_tx_ant(sc));
if (ret) {