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

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
...@@ -318,15 +318,6 @@ static int ath9k_htc_add_monitor_interface(struct ath9k_htc_priv *priv) ...@@ -318,15 +318,6 @@ static int ath9k_htc_add_monitor_interface(struct ath9k_htc_priv *priv)
priv->sta_slot |= (1 << sta_idx); priv->sta_slot |= (1 << sta_idx);
priv->nstations++; 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->vif_sta_pos[priv->mon_vif_idx] = sta_idx;
priv->ah->is_monitoring = true; priv->ah->is_monitoring = true;
...@@ -1050,6 +1041,11 @@ static int ath9k_htc_start(struct ieee80211_hw *hw) ...@@ -1050,6 +1041,11 @@ static int ath9k_htc_start(struct ieee80211_hw *hw)
ath9k_host_rx_init(priv); 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; priv->op_flags &= ~OP_INVALID;
htc_start(priv->htc); htc_start(priv->htc);
...@@ -1182,11 +1178,6 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw, ...@@ -1182,11 +1178,6 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw,
if (ret) if (ret)
goto out; 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->ah->opmode = vif->type;
priv->vif_slot |= (1 << avp->index); priv->vif_slot |= (1 << avp->index);
priv->vif = vif; priv->vif = vif;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment