aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/main.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-12-07 19:35:00 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:06:15 -0500
commitac47246e246c183ed68b3fdb307a83d00313a325 (patch)
treebe16670a7fd60c0acd07a6914b424b6b1bebb4ff /drivers/net/wireless/libertas/main.c
parent99c893f34ab932171af27264c0cba4946ca0c355 (diff)
libertas: kill adapter->nr_cmd_pending
Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
-rw-r--r--drivers/net/wireless/libertas/main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index a5b573ce5454..500357ba48db 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -929,14 +929,13 @@ static int lbs_thread(void *data)
929 /* Wake-up command waiters which can't sleep in 929 /* Wake-up command waiters which can't sleep in
930 * lbs_prepare_and_send_command 930 * lbs_prepare_and_send_command
931 */ 931 */
932 if (!adapter->nr_cmd_pending) 932 if (!list_empty(&adapter->cmdpendingq))
933 wake_up_all(&adapter->cmd_pending); 933 wake_up_all(&adapter->cmd_pending);
934 934
935 lbs_tx_runqueue(priv); 935 lbs_tx_runqueue(priv);
936 } 936 }
937 937
938 del_timer(&adapter->command_timer); 938 del_timer(&adapter->command_timer);
939 adapter->nr_cmd_pending = 0;
940 wake_up_all(&adapter->cmd_pending); 939 wake_up_all(&adapter->cmd_pending);
941 940
942 lbs_deb_leave(LBS_DEB_THREAD); 941 lbs_deb_leave(LBS_DEB_THREAD);
@@ -1105,7 +1104,6 @@ static int lbs_init_adapter(struct lbs_private *priv)
1105 1104
1106 spin_lock_init(&adapter->driver_lock); 1105 spin_lock_init(&adapter->driver_lock);
1107 init_waitqueue_head(&adapter->cmd_pending); 1106 init_waitqueue_head(&adapter->cmd_pending);
1108 adapter->nr_cmd_pending = 0;
1109 1107
1110 /* Allocate the command buffers */ 1108 /* Allocate the command buffers */
1111 if (lbs_allocate_cmd_buffer(priv)) { 1109 if (lbs_allocate_cmd_buffer(priv)) {