diff options
| author | adrian <adrian@FreeBSD.org> | 2016-06-02 06:22:59 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2016-06-02 06:22:59 +0000 |
| commit | ee47f5dd0784d4c164e8e1f5f7e3e7b68516c6fd (patch) | |
| tree | d13dc80c0dfccedd95ba5b046e4518b740127111 | |
| parent | e0537e6ebb042481cc37f7fee1ad59944a5d2610 (diff) | |
| download | FreeBSD-src-ee47f5dd0784d4c164e8e1f5f7e3e7b68516c6fd.zip FreeBSD-src-ee47f5dd0784d4c164e8e1f5f7e3e7b68516c6fd.tar.gz | |
[iwm] valid_{tx,rx}_ant from radio_cfg is only needed for 8000 family.
* The "if (!data->valid_tx_ant || !data->valid_rx_ant) {" check was getting
triggered with a 3165 chipset.
Submitted by: Imre Vadasz <imre@vdsz.com>
Obtained from: DragonflyBSD 3655dfb6fc311fc83e5ce8370dd91b4cd4a37991
| -rw-r--r-- | sys/dev/iwm/if_iwm.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c index f102333..b60d053 100644 --- a/sys/dev/iwm/if_iwm.c +++ b/sys/dev/iwm/if_iwm.c @@ -1764,22 +1764,12 @@ 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); data->sku_cap_band_24GHz_enable = sku & IWM_NVM_SKU_CAP_BAND_24GHZ; data->sku_cap_band_52GHz_enable = sku & IWM_NVM_SKU_CAP_BAND_52GHZ; data->sku_cap_11n_enable = 0; - if (!data->valid_tx_ant || !data->valid_rx_ant) { - device_printf(sc->sc_dev, - "%s: invalid antennas (0x%x, 0x%x)\n", - __func__, data->valid_tx_ant, - data->valid_rx_ant); - return EINVAL; - } - data->n_hw_addrs = le16_to_cpup(nvm_sw + IWM_N_HW_ADDRS); data->xtal_calib[0] = *(nvm_calib + IWM_XTAL_CALIB); |
