From: David Woodhouse <dwmw2@infradead.org>
Date: Mon, 17 Dec 2007 20:12:49 +0000 (-0500)
Subject: libertas: reduce explicit references to priv->cur_cmd->cmdbuf
X-Git-Tag: v2.6.25-rc1~1162^2~303
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ac4cced6e850496b66c0825b7f74d51ef02c6371;p=karo-tx-linux.git

libertas: reduce explicit references to priv->cur_cmd->cmdbuf

We have a local variable 'resp' which we use for this. So use it,
instead of typing the whole thing.

In preparation for actually using priv->upld_buf for the responses
instead...

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index 8f9eda4d1be1..d305e982c502 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -639,10 +639,10 @@ int lbs_process_rx_command(struct lbs_private *priv)
 		goto done;
 	}
 
-	curcmd = le16_to_cpu(priv->cur_cmd->cmdbuf->command);
-
 	resp = priv->cur_cmd->cmdbuf;
 
+	curcmd = le16_to_cpu(resp->command);
+
 	respcmd = le16_to_cpu(resp->command);
 	result = le16_to_cpu(resp->result);
 
@@ -650,9 +650,9 @@ int lbs_process_rx_command(struct lbs_private *priv)
 		     respcmd, le16_to_cpu(resp->seqnum), priv->upld_len, jiffies);
 	lbs_deb_hex(LBS_DEB_HOST, "CMD_RESP", (void *) resp, priv->upld_len);
 
-	if (resp->seqnum != priv->cur_cmd->cmdbuf->seqnum) {
+	if (resp->seqnum != resp->seqnum) {
 		lbs_pr_info("Received CMD_RESP with invalid sequence %d (expected %d)\n",
-			    le16_to_cpu(resp->seqnum), le16_to_cpu(priv->cur_cmd->cmdbuf->seqnum));
+			    le16_to_cpu(resp->seqnum), le16_to_cpu(resp->seqnum));
 		spin_unlock_irqrestore(&priv->driver_lock, flags);
 		ret = -1;
 		goto done;