From: David Woodhouse Date: Mon, 17 Dec 2007 20:41:30 +0000 (-0500) Subject: libertas: discard DEFER responses to commands; let the timeout trigger X-Git-Tag: v2.6.25-rc1~1162^2~301 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8538823f7c692c98e8b7e19cb580faa56e25e89f;p=linux-2.6 libertas: discard DEFER responses to commands; let the timeout trigger When the firmware returns 0x0004, it wants us to try again later. We can achieve that simply by throwing out the response and letting the command timeout code kick in. Signed-off-by: David Woodhouse Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c index 4d384612af..0cd9662829 100644 --- a/drivers/net/wireless/libertas/cmdresp.c +++ b/drivers/net/wireless/libertas/cmdresp.c @@ -665,6 +665,16 @@ int lbs_process_rx_command(struct lbs_private *priv) goto done; } + if (resp->result == cpu_to_le16(0x0004)) { + /* 0x0004 means -EAGAIN. Drop the response, let it time out + and be resubmitted */ + lbs_pr_info("Firmware returns DEFER to command %x. Will let it time out...\n", + le16_to_cpu(resp->command)); + spin_unlock_irqrestore(&priv->driver_lock, flags); + ret = -1; + goto done; + } + /* Now we got response from FW, cancel the command timer */ del_timer(&priv->command_timer); priv->cmd_timed_out = 0;