---

yaml --- r: 220135 b: refs/heads/master c: 5a505da h: refs/heads/master i: 220133: 7bc5136 220131: 150bfb7 220127: 4eba29e v: v3
git-mirror · Oct 6, 2010 · e7ff628 · e7ff628
1 parent 1f6cf22
commit e7ff628
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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