Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1057b750 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k_htc: Unify target capability updating 



Update capabilites on the target once, when
start() is called, there is no need for redundant
updating on adding an interface.

Signed-off-by: default avatarSujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a97b478c

drivers/net/wireless/ath/ath9k/htc_drv_main.c

+5 −14
Original line number Diff line number Diff line
@@ -318,15 +318,6 @@ static int ath9k_htc_add_monitor_interface(struct ath9k_htc_priv *priv) 


	priv->sta_slot |= (1 << sta_idx);

	priv->nstations++;



	/*

	 * Set chainmask etc. on the target.

	 */

	ret = ath9k_htc_update_cap_target(priv);

	if (ret)

		ath_dbg(common, ATH_DBG_CONFIG,

			"Failed to update capability in target\n");



	priv->vif_sta_pos[priv->mon_vif_idx] = sta_idx;

	priv->ah->is_monitoring = true;
@@ -1050,6 +1041,11 @@ static int ath9k_htc_start(struct ieee80211_hw *hw) 


	ath9k_host_rx_init(priv);



	ret = ath9k_htc_update_cap_target(priv);

	if (ret)

		ath_dbg(common, ATH_DBG_CONFIG,

			"Failed to update capability in target\n");



	priv->op_flags &= ~OP_INVALID;

	htc_start(priv->htc);
@@ -1182,11 +1178,6 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw, 
	if (ret)

		goto out;



	ret = ath9k_htc_update_cap_target(priv);

	if (ret)

		ath_dbg(common, ATH_DBG_CONFIG,

			"Failed to update capability in target\n");



	priv->ah->opmode = vif->type;

	priv->vif_slot |= (1 << avp->index);

	priv->vif = vif;