From 11f577ba9fd71b8c47faa26482b0832ddbdfaab4 Mon Sep 17 00:00:00 2001
From: Sebastian Wankerl <sisewank@cip.cs.fau.de>
Date: Sun, 20 Jan 2013 16:24:45 +0100
Subject: [PATCH] --- yaml --- r: 354095 b: refs/heads/master c:
 52070c709dbc493da550086709934e6028457a7c h: refs/heads/master i:   354093:
 b7ab31cc56ff9199497e155cca310cb5f0efe860   354091:
 c42040592e9e8745afc08725e97ef83e1d95def4   354087:
 547e5ee848c6d6ace74eaa15814817e1cf4d0f83   354079:
 5966addb5b6fce5d3aa56f996e9401de61148e4f v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/staging/wlan-ng/prism2mgmt.c | 25 +++++++++++++---------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 7259b3ec25c7..17375cd83967 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4156a7603709b2232603b10f1835f351d89b263e
+refs/heads/master: 52070c709dbc493da550086709934e6028457a7c
diff --git a/trunk/drivers/staging/wlan-ng/prism2mgmt.c b/trunk/drivers/staging/wlan-ng/prism2mgmt.c
index 4efa9bc0fcf0..62b94b017a60 100644
--- a/trunk/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/trunk/drivers/staging/wlan-ng/prism2mgmt.c
@@ -415,11 +415,14 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
 			break;
 
 #define REQBASICRATE(N) \
-	if ((count >= N) && DOT11_RATE5_ISBASIC_GET(item->supprates[(N)-1])) { \
-		req->basicrate ## N .data = item->supprates[(N)-1]; \
-		req->basicrate ## N .status = \
-			P80211ENUM_msgitem_status_data_ok; \
-	}
+	do { \
+		if ((count >= N) && DOT11_RATE5_ISBASIC_GET( \
+			item->supprates[(N)-1])) { \
+			req->basicrate ## N .data = item->supprates[(N)-1]; \
+			req->basicrate ## N .status = \
+				P80211ENUM_msgitem_status_data_ok; \
+		} \
+	} while (0)
 
 	REQBASICRATE(1);
 	REQBASICRATE(2);
@@ -431,11 +434,13 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
 	REQBASICRATE(8);
 
 #define REQSUPPRATE(N) \
-	if (count >= N) { \
-		req->supprate ## N .data = item->supprates[(N)-1]; \
-		req->supprate ## N .status = \
-			P80211ENUM_msgitem_status_data_ok; \
-	}
+	do { \
+		if (count >= N) { \
+			req->supprate ## N .data = item->supprates[(N)-1]; \
+			req->supprate ## N .status = \
+				P80211ENUM_msgitem_status_data_ok; \
+		} \
+	} while (0)
 
 	REQSUPPRATE(1);
 	REQSUPPRATE(2);