diff options
| author |   stsp <stsp@openbsd.org> | 2016-05-28 08:34:17 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2016-05-28 08:34:17 +0000 |
| commit | 3bec69d8f10046f2821ab88b6e9d5859be9f7309 (patch) | |
| tree | aa4b20a72068096a7ed7c5c5783aad4165c520a2 | |
| parent | iwm(4) man page updates (new firmware version 16, 8260 device support) (diff) | |
| download | wireguard-openbsd-3bec69d8f10046f2821ab88b6e9d5859be9f7309.tar.xz wireguard-openbsd-3bec69d8f10046f2821ab88b6e9d5859be9f7309.zip | |
In iwm(4), don't parse nvram antenna data for 7k devices, they don't have it.
And don't complain if no data is provided in nvram, needed for 3165 devices.
Patch by Imre Vadasz.
| -rw-r--r-- | sys/dev/pci/if_iwm.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index e009641cbf7..667b9bbc7c9 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.83 2016/05/28 08:13:16 stsp Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.84 2016/05/28 08:34:17 stsp Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh <info@genua.de> @@ -2942,8 +2942,6 @@ iwm_parse_nvm_data(struct iwm_softc *sc, data->radio_cfg_step = IWM_NVM_RF_CFG_STEP_MSK(radio_cfg); data->radio_cfg_dash = IWM_NVM_RF_CFG_DASH_MSK(radio_cfg); data->radio_cfg_pnum = IWM_NVM_RF_CFG_PNUM_MSK(radio_cfg); - data->valid_tx_ant = IWM_NVM_RF_CFG_TX_ANT_MSK(radio_cfg); - data->valid_rx_ant = IWM_NVM_RF_CFG_RX_ANT_MSK(radio_cfg); sku = le16_to_cpup(nvm_sw + IWM_SKU); } else { @@ -2964,13 +2962,6 @@ iwm_parse_nvm_data(struct iwm_softc *sc, data->sku_cap_11n_enable = sku & IWM_NVM_SKU_CAP_11N_ENABLE; data->sku_cap_mimo_disable = sku & IWM_NVM_SKU_CAP_MIMO_DISABLE; - if (!data->valid_tx_ant || !data->valid_rx_ant) { - DPRINTF(("%s: invalid antennas (0x%x, 0x%x)\n", - DEVNAME(sc), data->valid_tx_ant, - data->valid_rx_ant)); - return EINVAL; - } - data->n_hw_addrs = le16_to_cpup(nvm_sw + IWM_N_HW_ADDRS); /* The byte order is little endian 16 bit, meaning 214365 */ |