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

Commit fe67470d authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

ath9k_htc: Enable ANI in associated state only 



While scanning, ANI is triggered unnecessarily where sta is in
unassociated state. And cancelling ani work in ath9k_htc_stop
is not required.

Signed-off-by: default avatarRajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0ec2f272

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

+5 −4
Original line number Diff line number Diff line
@@ -1239,7 +1239,6 @@ static void ath9k_htc_stop(struct ieee80211_hw *hw) 


	/* Cancel all the running timers/work .. */

	cancel_work_sync(&priv->ps_work);

	cancel_delayed_work_sync(&priv->ath9k_ani_work);

	cancel_delayed_work_sync(&priv->ath9k_led_blink_work);

	ath9k_led_stop_brightness(priv);
@@ -1787,6 +1786,7 @@ static void ath9k_htc_sw_scan_start(struct ieee80211_hw *hw) 
	priv->op_flags |= OP_SCANNING;

	spin_unlock_bh(&priv->beacon_lock);

	cancel_work_sync(&priv->ps_work);

	if (priv->op_flags & OP_ASSOCIATED)

		cancel_delayed_work_sync(&priv->ath9k_ani_work);

	mutex_unlock(&priv->mutex);

}
@@ -1801,9 +1801,10 @@ static void ath9k_htc_sw_scan_complete(struct ieee80211_hw *hw) 
	priv->op_flags &= ~OP_SCANNING;

	spin_unlock_bh(&priv->beacon_lock);

	priv->op_flags |= OP_FULL_RESET;

	if (priv->op_flags & OP_ASSOCIATED)

	if (priv->op_flags & OP_ASSOCIATED) {

		ath9k_htc_beacon_config(priv, priv->vif);

		ath_start_ani(priv);

	}

	ath9k_htc_ps_restore(priv);

	mutex_unlock(&priv->mutex);

}