libertas: don't retry commands
PATCH 1/1 libertas: don't retry commands
Retrying commands seldomly works, most often the firmware is in a weird state anyway and needs the device to reset. So it's better to report the broken state back to user-space.
Also rename command_timer_fn() into lbs_cmd_timeout_handler(), which better reflect it's usage.
Signed-off-by Holger Schurig <[email protected]>
--- drivers/net/wireless/libertas/cmdresp.c | 5 ----- drivers/net/wireless/libertas/dev.h | 1 - drivers/net/wireless/libertas/main.c | 31 +++++++------------------------ 3 files changed, 7 insertions(+), 30 deletions(-)
drivers/net/wireless/libertas/cmdresp.c +0 -5
@@ -218,11 +218,6 @@ int lbs_process_command_response(struct/* Now we got response from FW, cancel the command timer */ del_timer (&priv->command_timer); priv->cmd_timed_out =0 ; -if (priv->nr_retries) { -lbs_pr_info ("Received result %x to command %x after %d retries\n" , - result, curcmd, priv->nr_retries); - priv->nr_retries =0 ; - }/* Store the response code to cur_cmd_retcode. */ priv->cur_cmd_retcode = result;
drivers/net/wireless/libertas/dev.h +0 -1
@@ -107,7 +107,6 @@ struct lbs_private {struct list_head cmdpendingq;/* pending command buffers */ wait_queue_head_t cmd_pending;struct timer_list command_timer; -int nr_retries;int cmd_timed_out;/* Command responses sent from the hardware to the driver */
drivers/net/wireless/libertas/main.c +7 -24
@@ -457,31 +457,14 @@ static int lbs_thread(void *data)if (priv->cmd_timed_out && priv->cur_cmd) {struct cmd_ctrl_node *cmdnode = priv->cur_cmd; -if (++priv->nr_retries >3 ) { -lbs_pr_info ("Excessive timeouts submitting " -"command 0x%04x\n" , -le16_to_cpu (cmdnode->cmdbuf->command)); -lbs_complete_command (priv, cmdnode, -ETIMEDOUT ); - priv->nr_retries =0 ; -if (priv->reset_card) - priv->reset_card (priv); - }else { - priv->cur_cmd =NULL ; - priv->dnld_sent =DNLD_RES_RECEIVED ; -lbs_pr_info ("requeueing command 0x%04x due " -"to timeout (#%d)\n" , -le16_to_cpu (cmdnode->cmdbuf->command), - priv->nr_retries); - -/* Stick it back at the _top_ of the pending queue -for immediate resubmission */ -list_add (&cmdnode->list, &priv->cmdpendingq); - } +lbs_pr_info ("Timeout submitting command 0x%04x\n" , +le16_to_cpu (cmdnode->cmdbuf->command)); +lbs_complete_command (priv, cmdnode, -ETIMEDOUT ); +if (priv->reset_card) + priv->reset_card (priv); } priv->cmd_timed_out =0 ; - -if (!priv->fw_ready)continue ;
@@ -653,7 +636,7 @@ done:* This function handles the timeout of command sending. * It will re-send the same command again. */ -static void command_timer_fn (unsigned long data) +static void lbs_cmd_timeout_handler (unsigned long data) {struct lbs_private *priv = (struct lbs_private *)data;unsigned long flags;
@@ -751,7 +734,7 @@ static int lbs_init_adapter(struct lbs_pmutex_init (&priv->lock); -setup_timer (&priv->command_timer, command_timer_fn, +setup_timer (&priv->command_timer, lbs_cmd_timeout_handler, (unsigned long )priv);setup_timer (&priv->auto_deepsleep_timer, auto_deepsleep_timer_fn, (unsigned long )priv);