aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/libertas/dev.h1
-rw-r--r--drivers/net/wireless/libertas/main.c8
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 85cdc9a0a637..3c7e255e18c7 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -111,7 +111,6 @@ struct lbs_private {
111 struct cmd_ctrl_node *cur_cmd; 111 struct cmd_ctrl_node *cur_cmd;
112 struct list_head cmdfreeq; /* free command buffers */ 112 struct list_head cmdfreeq; /* free command buffers */
113 struct list_head cmdpendingq; /* pending command buffers */ 113 struct list_head cmdpendingq; /* pending command buffers */
114 wait_queue_head_t cmd_pending;
115 struct timer_list command_timer; 114 struct timer_list command_timer;
116 int cmd_timed_out; 115 int cmd_timed_out;
117 116
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 2398fc5170ef..258967144b96 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -502,12 +502,6 @@ static int lbs_thread(void *data)
502 if (!priv->dnld_sent && !priv->cur_cmd) 502 if (!priv->dnld_sent && !priv->cur_cmd)
503 lbs_execute_next_command(priv); 503 lbs_execute_next_command(priv);
504 504
505 /* Wake-up command waiters which can't sleep in
506 * lbs_prepare_and_send_command
507 */
508 if (!list_empty(&priv->cmdpendingq))
509 wake_up_all(&priv->cmd_pending);
510
511 spin_lock_irq(&priv->driver_lock); 505 spin_lock_irq(&priv->driver_lock);
512 if (!priv->dnld_sent && priv->tx_pending_len > 0) { 506 if (!priv->dnld_sent && priv->tx_pending_len > 0) {
513 int ret = priv->hw_host_to_card(priv, MVMS_DAT, 507 int ret = priv->hw_host_to_card(priv, MVMS_DAT,
@@ -533,7 +527,6 @@ static int lbs_thread(void *data)
533 527
534 del_timer(&priv->command_timer); 528 del_timer(&priv->command_timer);
535 del_timer(&priv->auto_deepsleep_timer); 529 del_timer(&priv->auto_deepsleep_timer);
536 wake_up_all(&priv->cmd_pending);
537 530
538 lbs_deb_leave(LBS_DEB_THREAD); 531 lbs_deb_leave(LBS_DEB_THREAD);
539 return 0; 532 return 0;
@@ -741,7 +734,6 @@ static int lbs_init_adapter(struct lbs_private *priv)
741 INIT_LIST_HEAD(&priv->cmdpendingq); 734 INIT_LIST_HEAD(&priv->cmdpendingq);
742 735
743 spin_lock_init(&priv->driver_lock); 736 spin_lock_init(&priv->driver_lock);
744 init_waitqueue_head(&priv->cmd_pending);
745 737
746 /* Allocate the command buffers */ 738 /* Allocate the command buffers */
747 if (lbs_allocate_cmd_buffer(priv)) { 739 if (lbs_allocate_cmd_buffer(priv)) {