Date: Thu, 2 Jun 2016 06:22:59 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r301193 - head/sys/dev/iwm Message-ID: <201606020622.u526Mx60040931@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Thu Jun 2 06:22:59 2016 New Revision: 301193 URL: https://svnweb.freebsd.org/changeset/base/301193 Log: [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 Modified: head/sys/dev/iwm/if_iwm.c Modified: head/sys/dev/iwm/if_iwm.c ============================================================================== --- head/sys/dev/iwm/if_iwm.c Thu Jun 2 05:43:16 2016 (r301192) +++ head/sys/dev/iwm/if_iwm.c Thu Jun 2 06:22:59 2016 (r301193) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606020622.u526Mx60040931>