From 0271696663849354781898ab20a190462e0f00c3 Mon Sep 17 00:00:00 2001 From: Paul Stewart Date: Wed, 14 Nov 2012 12:25:52 -0800 Subject: [PATCH] CHROMIUMOS: Revert "mwifiex: Set timeout for mwifiex_wait_queue_complete" This was meant to isolate issues with command timeouts for debugging purposes. We are proceeding with a different debugging path now. This reverts commit e0514c155f95de286656a3d4306df852ea107987. Signed-off-by: Paul Stewart BUG=chrome-os-partner:15129 TEST=Boot, connect to network Change-Id: I9b2fa79803605bc8b92d93a57fb0c850113c9fac Reviewed-on: https://gerrit.chromium.org/gerrit/38119 Reviewed-by: mukesh agrawal Commit-Ready: Paul Stewart Tested-by: Paul Stewart --- drivers/net/wireless/mwifiex/main.h | 2 -- drivers/net/wireless/mwifiex/sta_ioctl.c | 15 ++------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h index 9f984496510a..4fe6617941ef 100644 --- a/drivers/net/wireless/mwifiex/main.h +++ b/drivers/net/wireless/mwifiex/main.h @@ -116,8 +116,6 @@ enum { #define MWIFIEX_EVENT_HEADER_LEN 4 -#define MWIFIEX_QUEUE_TIMEOUT_MSEC 5000 - struct mwifiex_dbg { u32 num_cmd_host_to_card_failure; u32 num_cmd_sleep_cfm_host_to_card_failure; diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c index e2d279478762..cad27cd8024b 100644 --- a/drivers/net/wireless/mwifiex/sta_ioctl.c +++ b/drivers/net/wireless/mwifiex/sta_ioctl.c @@ -59,7 +59,6 @@ int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter) bool cancel_flag = false; int status; struct cmd_ctrl_node *cmd_queued; - int ret; if (!adapter->cmd_queued) return 0; @@ -71,18 +70,8 @@ int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter) atomic_inc(&adapter->cmd_pending); /* Wait for completion */ - ret = wait_event_interruptible_timeout(adapter->cmd_wait_q.wait, - *(cmd_queued->condition), - msecs_to_jiffies(MWIFIEX_QUEUE_TIMEOUT_MSEC)); - if (ret == 0) { - WARN_ON(1); - /* Let's give waiting one more try, and then reboot */ - ret = wait_event_interruptible_timeout(adapter->cmd_wait_q.wait, - *(cmd_queued->condition), - msecs_to_jiffies(MWIFIEX_QUEUE_TIMEOUT_MSEC)); - BUG_ON(ret == 0); - } - + wait_event_interruptible(adapter->cmd_wait_q.wait, + *(cmd_queued->condition)); if (!*(cmd_queued->condition)) cancel_flag = true; -- 2.20.1