From f8c72f565a2e1f9bc2418b851f4e761fbdb8a04a Mon Sep 17 00:00:00 2001
From: Jason Cooper <jason@lakedaemon.net>
Date: Thu, 30 Sep 2010 15:15:36 -0400
Subject: [PATCH] --- yaml --- r: 220034 b: refs/heads/master c:
 57c096b897fe59e106452500afbbe0e0f1f8e149 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../staging/brcm80211/brcmfmac/bcmutils.c     | 27 ++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 4f9a40497c3c..b1708d5e698b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c74c95cd1f6e4b59ecd75c0584b8b5589e7b60a3
+refs/heads/master: 57c096b897fe59e106452500afbbe0e0f1f8e149
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c
index 34c37918ff5e..7c06c7a8294b 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c
@@ -199,10 +199,12 @@ void *pktq_pdeq(struct pktq *pq, int prec)
 
 	q = &pq->q[prec];
 
-	if ((p = q->head) == NULL)
+	p = q->head;
+	if (p == NULL)
 		return NULL;
 
-	if ((q->head = PKTLINK(p)) == NULL)
+	q->head = PKTLINK(p);
+	if (q->head == NULL)
 		q->tail = NULL;
 
 	q->len--;
@@ -223,7 +225,8 @@ void *pktq_pdeq_tail(struct pktq *pq, int prec)
 
 	q = &pq->q[prec];
 
-	if ((p = q->head) == NULL)
+	p = q->head;
+	if (p == NULL)
 		return NULL;
 
 	for (prev = NULL; p != q->tail; p = PKTLINK(p))
@@ -274,7 +277,8 @@ bool pktq_pdel(struct pktq *pq, void *pktbuf, int prec)
 	q = &pq->q[prec];
 
 	if (q->head == pktbuf) {
-		if ((q->head = PKTLINK(pktbuf)) == NULL)
+		q->head = PKTLINK(pktbuf);
+		if (q->head == NULL)
 			q->tail = NULL;
 	} else {
 		for (p = q->head; p && PKTLINK(p) != pktbuf; p = PKTLINK(p))
@@ -325,10 +329,12 @@ void *pktq_deq(struct pktq *pq, int *prec_out)
 
 	q = &pq->q[prec];
 
-	if ((p = q->head) == NULL)
+	p = q->head;
+	if (p == NULL)
 		return NULL;
 
-	if ((q->head = PKTLINK(p)) == NULL)
+	q->head = PKTLINK(p);
+	if (q->head == NULL)
 		q->tail = NULL;
 
 	q->len--;
@@ -358,7 +364,8 @@ void *pktq_deq_tail(struct pktq *pq, int *prec_out)
 
 	q = &pq->q[prec];
 
-	if ((p = q->head) == NULL)
+	p = q->head;
+	if (p == NULL)
 		return NULL;
 
 	for (prev = NULL; p != q->tail; p = PKTLINK(p))
@@ -456,10 +463,12 @@ void *pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out)
 
 	q = &pq->q[prec];
 
-	if ((p = q->head) == NULL)
+	p = q->head;
+	if (p == NULL)
 		return NULL;
 
-	if ((q->head = PKTLINK(p)) == NULL)
+	q->head = PKTLINK(p);
+	if (q->head == NULL)
 		q->tail = NULL;
 
 	q->len--;