From: Sebastian Wankerl <sisew...@faui49man10.informatik.uni-erlangen.de>

Here the hopefully fixed version.

Signed-off-by: Sebastian Wankerl <sisew...@cip.cs.fau.de> 
Signed-off-by: Sebastian Ehrenfels <qi50d...@cip.cs.fau.de> 

---
 drivers/staging/wlan-ng/prism2mgmt.c |   25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/wlan-ng/prism2mgmt.c 
b/drivers/staging/wlan-ng/prism2mgmt.c
index 4efa9bc..62b94b0 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/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);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to