diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2016-05-28 08:34:18 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2016-05-28 08:34:18 +0000 |
| commit | 8460b0bdef2ca69c1e2f5facaec5dc85b81051ac (patch) | |
| tree | e1ecb232a7c9dc0321dfe32139a4bb4799c2ec6c /sys | |
| parent | 713d57f5d4f7a70ef3b0b2191ff111d063e1b32e (diff) | |
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.
Diffstat (limited to 'sys')
| -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 */ |