From d43f471467ca7492e2cd26799f59363fd24143ab Mon Sep 17 00:00:00 2001 From: Vasanthakumar Thiagarajan Date: Wed, 29 Aug 2012 19:40:28 +0530 Subject: [PATCH] --- yaml --- r: 341443 b: refs/heads/master c: 77565794eb69cf73a5808c04b01bc2a97ebf32d3 h: refs/heads/master i: 341441: 0ae03bb01f0786f96de4ce1b64f4c1f97f1789e0 341439: 032aa893eb59d297be22abcc93d321ee208c255a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/core.h | 1 + trunk/drivers/net/wireless/ath/ath6kl/recovery.c | 2 ++ trunk/drivers/net/wireless/ath/ath6kl/txrx.c | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 797876e1098f..a2d254d813b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9233299394de1c571e52ab2dbe1995c1fbdc8fda +refs/heads/master: 77565794eb69cf73a5808c04b01bc2a97ebf32d3 diff --git a/trunk/drivers/net/wireless/ath/ath6kl/core.h b/trunk/drivers/net/wireless/ath/ath6kl/core.h index b2cbecf6cfe5..ac90b31514bd 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/core.h +++ b/trunk/drivers/net/wireless/ath/ath6kl/core.h @@ -660,6 +660,7 @@ enum ath6kl_state { enum ath6kl_fw_err { ATH6KL_FW_ASSERT, ATH6KL_FW_HB_RESP_FAILURE, + ATH6KL_FW_EP_FULL, }; struct ath6kl { diff --git a/trunk/drivers/net/wireless/ath/ath6kl/recovery.c b/trunk/drivers/net/wireless/ath/ath6kl/recovery.c index 4e3f205bb8a0..03edeb8c2ce3 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/recovery.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/recovery.c @@ -30,6 +30,8 @@ static void ath6kl_recovery_work(struct work_struct *work) ath6kl_init_hw_restart(ar); ar->state = ATH6KL_STATE_ON; + clear_bit(WMI_CTRL_EP_FULL, &ar->flag); + ar->fw_recovery.err_reason = 0; if (ar->fw_recovery.enable) diff --git a/trunk/drivers/net/wireless/ath/ath6kl/txrx.c b/trunk/drivers/net/wireless/ath/ath6kl/txrx.c index cbe1a9d89112..e867193373fe 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/txrx.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/txrx.c @@ -594,6 +594,7 @@ enum htc_send_full_action ath6kl_tx_queue_full(struct htc_target *target, */ set_bit(WMI_CTRL_EP_FULL, &ar->flag); ath6kl_err("wmi ctrl ep is full\n"); + ath6kl_recovery_err_notify(ar, ATH6KL_FW_EP_FULL); return action; }