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))