From cb982b1a3505f566081fd741f5ef5186b9f7d1e4 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mikem@ring3k.org>
Date: Mon, 27 Dec 2010 21:49:49 +0900
Subject: [PATCH] --- yaml --- r: 235623 b: refs/heads/master c:
 dd1847332a5e5c6ac945ad12db0bc49871481d3a h: refs/heads/master i:   235621:
 d6d74de98e10b1db44529a9d3c6fe1615713020c   235619:
 1b9fdedf343ad3aae3a5fff6e0589cdc3c87e545   235615:
 79fe13233f502801cd93241d9ed39f09e73da8a4 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/rtl8192e/dot11d.h | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4b12ca0c822d..b3c8545fdda1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03996954fd758c4f3b5de6528f77db16ef460eb3
+refs/heads/master: dd1847332a5e5c6ac945ad12db0bc49871481d3a
diff --git a/trunk/drivers/staging/rtl8192e/dot11d.h b/trunk/drivers/staging/rtl8192e/dot11d.h
index 86660833d110..106ebcfa7d7d 100644
--- a/trunk/drivers/staging/rtl8192e/dot11d.h
+++ b/trunk/drivers/staging/rtl8192e/dot11d.h
@@ -41,9 +41,10 @@ typedef struct _RT_DOT11D_INFO {
 	DOT11D_STATE State;
 } RT_DOT11D_INFO, *PRT_DOT11D_INFO;
 
-#define cpMacAddr(des, src) ((des)[0] = (src)[0], (des)[1] = (src)[1], \
-			(des)[2] = (src)[2], (des)[3] = (src)[3], \
-			(des)[4] = (src)[4], (des)[5] = (src)[5])
+static inline void cpMacAddr(unsigned char *des, unsigned char *src)
+{
+	memcpy(des, src, 6);
+}
 
 #define GET_DOT11D_INFO(__pIeeeDev) ((PRT_DOT11D_INFO) \
 			((__pIeeeDev)->pDot11dInfo))