aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/cmd.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/cmd.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/cmd.c')
-rw-r--r--drivers/net/wireless/libertas/cmd.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index cf1ab8a345fe..092c295e3802 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1009,10 +1009,9 @@ void lbs_queue_cmd(struct lbs_adapter *adapter,
1009 1009
1010 spin_lock_irqsave(&adapter->driver_lock, flags); 1010 spin_lock_irqsave(&adapter->driver_lock, flags);
1011 1011
1012 if (addtail) { 1012 if (addtail)
1013 list_add_tail(&cmdnode->list, &adapter->cmdpendingq); 1013 list_add_tail(&cmdnode->list, &adapter->cmdpendingq);
1014 adapter->nr_cmd_pending++; 1014 else
1015 } else
1016 list_add(&cmdnode->list, &adapter->cmdpendingq); 1015 list_add(&cmdnode->list, &adapter->cmdpendingq);
1017 1016
1018 spin_unlock_irqrestore(&adapter->driver_lock, flags); 1017 spin_unlock_irqrestore(&adapter->driver_lock, flags);
@@ -1078,7 +1077,6 @@ static int DownloadcommandToStation(struct lbs_private *priv,
1078 spin_lock_irqsave(&adapter->driver_lock, flags); 1077 spin_lock_irqsave(&adapter->driver_lock, flags);
1079 adapter->cur_cmd_retcode = ret; 1078 adapter->cur_cmd_retcode = ret;
1080 __lbs_cleanup_and_insert_cmd(priv, adapter->cur_cmd); 1079 __lbs_cleanup_and_insert_cmd(priv, adapter->cur_cmd);
1081 adapter->nr_cmd_pending--;
1082 adapter->cur_cmd = NULL; 1080 adapter->cur_cmd = NULL;
1083 spin_unlock_irqrestore(&adapter->driver_lock, flags); 1081 spin_unlock_irqrestore(&adapter->driver_lock, flags);
1084 goto done; 1082 goto done;