Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[~andy/linux] / drivers / staging / rtl8192e / dot11d.h

diff --git a/drivers/staging/rtl8192e/dot11d.h b/drivers/staging/rtl8192e/dot11d.h
index 86660833d11063ac1b8dfa5694e1727a89e5a2b3..106ebcfa7d7dd07e6233f35e3808c45493d8e3b2 100644 (file)
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/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))