Commit bb99ff9b authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: mvm: fix support for single antenna diversity 



When the single antenna diversity support was sent upstream, only some
definitions were sent, due to a bad revert.

Fix this by adding the actual code.

Fixes: 5952e0ec ("iwlwifi: mvm: add support for single antenna diversity")
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 0756e913

drivers/net/wireless/intel/iwlwifi/mvm/fw.c

+16 −4
Original line number Diff line number Diff line
@@ -514,6 +514,18 @@ static int iwl_send_phy_cfg_cmd(struct iwl_mvm *mvm) 
	struct iwl_phy_cfg_cmd phy_cfg_cmd;

	enum iwl_ucode_type ucode_type = mvm->fwrt.cur_fw_img;



	if (iwl_mvm_has_unified_ucode(mvm) &&

	    !mvm->trans->cfg->tx_with_siso_diversity) {

		return 0;

	} else if (mvm->trans->cfg->tx_with_siso_diversity) {

		/*

		 * TODO: currently we don't set the antenna but letting the NIC

		 * to decide which antenna to use. This should come from BIOS.

		 */

		phy_cfg_cmd.phy_cfg =

			cpu_to_le32(FW_PHY_CFG_CHAIN_SAD_ENABLED);

	}



	/* Set parameters */

	phy_cfg_cmd.phy_cfg = cpu_to_le32(iwl_mvm_get_phy_config(mvm));
@@ -1344,11 +1356,11 @@ int iwl_mvm_up(struct iwl_mvm *mvm) 
		ret = iwl_send_phy_db_data(mvm->phy_db);

		if (ret)

			goto error;

	}



	ret = iwl_send_phy_cfg_cmd(mvm);

	if (ret)

		goto error;

	}



	ret = iwl_mvm_send_bt_init_conf(mvm);

	if (ret)

CRA Git | Maintained and supported by SUSTech CRA and CCSE