From e7ff628033705c447031d7dfed95e28698d7f3d5 Mon Sep 17 00:00:00 2001
From: Jason Cooper <jason@lakedaemon.net>
Date: Wed, 6 Oct 2010 10:08:03 -0400
Subject: [PATCH] --- yaml --- r: 220135 b: refs/heads/master c:
 5a505da957fc2f42ce53e5b0234cdf493f4f3ab0 h: refs/heads/master i:   220133:
 7bc5136753305af07c7fad5c4974b5a502e90c02   220131:
 150bfb75aeec93338164d96aff9daa974d98703d   220127:
 4eba29e277a477346c7d39559446ddb78d943f46 v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c  | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 9 ++++++---
 trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c     | 9 ++++++---
 trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.h     | 2 +-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 75f3e22647e4..e60f7384b416 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9887c9d9c37b8af80ae04aad1532d5c46687f8b
+refs/heads/master: 5a505da957fc2f42ce53e5b0234cdf493f4f3ab0
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c
index 68b57099a154..7185943a3b41 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c
@@ -1085,7 +1085,7 @@ static const u8 crc8_table[256] = {
 };
 
 #define CRC_INNER_LOOP(n, c, x) \
-	(c) = ((c) >> 8) ^ crc##n##_table[((c) ^ (x)) & 0xff]
+	((c) = ((c) >> 8) ^ crc##n##_table[((c) ^ (x)) & 0xff])
 
 u8 hndcrc8(u8 *pdata,	/* pointer to array of data to process */
 	      uint nbytes,	/* number of input data bytes to process */
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 42e2f2981bb4..3536011533dd 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -337,9 +337,12 @@ uint dhd_radio_up = 1;
 char iface_name[IFNAMSIZ];
 module_param_string(iface_name, iface_name, IFNAMSIZ, 0);
 
-#define DAEMONIZE(a) daemonize(a); \
-	allow_signal(SIGKILL); \
-	allow_signal(SIGTERM);
+#define DAEMONIZE(a) \
+	do { \
+		daemonize(a); \
+		allow_signal(SIGKILL); \
+		allow_signal(SIGTERM); \
+	} while (0);
 
 #define BLOCKABLE()	(!in_atomic())
 
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
index b2514d176353..d9124e258a51 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@ -107,9 +107,12 @@ static wlc_ssid_t g_specific_ssid;
 
 static wlc_ssid_t g_ssid;
 
-#define DAEMONIZE(a) daemonize(a); \
-	allow_signal(SIGKILL); \
-	allow_signal(SIGTERM);
+#define DAEMONIZE(a) \
+	do { \
+		daemonize(a); \
+		allow_signal(SIGKILL); \
+		allow_signal(SIGTERM); \
+	} while (0);
 
 #if defined(WL_IW_USE_ISCAN)
 #define ISCAN_STATE_IDLE   0
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.h b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.h
index 805c0902569f..cca4fd7f9e77 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.h
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.h
@@ -76,7 +76,7 @@ typedef struct wl_iw_extra_params {
 #define WL_FW_RELOAD            (SIOCIWFIRSTPRIV+27)
 #define WL_COMBO_SCAN            (SIOCIWFIRSTPRIV+29)
 #define WL_AP_SPARE3            (SIOCIWFIRSTPRIV+31)
-#define 		G_SCAN_RESULTS 8*1024
+#define G_SCAN_RESULTS		(8*1024)
 #define	WE_ADD_EVENT_FIX	0x80
 #define          G_WLAN_SET_ON	0
 #define          G_WLAN_SET_OFF	1