aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/bcmdhd/include/bcmutils.h
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2013-03-16 15:25:02 +0000
committercodeworkx <codeworkx@cyanogenmod.org>2013-03-16 15:25:02 +0000
commitcba07183cc76b06a5ef2b20eef70d203dc5bcd5d (patch)
treee9847236fac724bbe929a5f2da2ad074ac47f120 /drivers/net/wireless/bcmdhd/include/bcmutils.h
parent1fb968ea5a15b9ff31c6345c3c4aad523985e024 (diff)
parent44655588a0b361afa15761b5c58f5a558c1c181c (diff)
downloadkernel_samsung_smdk4412-cba07183cc76b06a5ef2b20eef70d203dc5bcd5d.zip
kernel_samsung_smdk4412-cba07183cc76b06a5ef2b20eef70d203dc5bcd5d.tar.gz
kernel_samsung_smdk4412-cba07183cc76b06a5ef2b20eef70d203dc5bcd5d.tar.bz2
Merge branch 'cm-10.1-experimental' into HEAD
Diffstat (limited to 'drivers/net/wireless/bcmdhd/include/bcmutils.h')
-rw-r--r--drivers/net/wireless/bcmdhd/include/bcmutils.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/bcmdhd/include/bcmutils.h b/drivers/net/wireless/bcmdhd/include/bcmutils.h
index b735090..cbbd7ef 100644
--- a/drivers/net/wireless/bcmdhd/include/bcmutils.h
+++ b/drivers/net/wireless/bcmdhd/include/bcmutils.h
@@ -659,12 +659,11 @@ extern void *_bcmutils_dummy_fn;
(ea).octet[5]
#if !defined(SIMPLE_MAC_PRINT)
#define MACDBG "%02x:%02x:%02x:%02x:%02x:%02x"
-#define STR_TO_MACD(ea) (ea)[0], (ea)[1], (ea)[2], (ea)[3], (ea)[4], (ea)[5]
+#define MAC2STRDBG(ea) (ea)[0], (ea)[1], (ea)[2], (ea)[3], (ea)[4], (ea)[5]
#else
#define MACDBG "%02x:%02x:%02x"
-#define STR_TO_MACD(ea) (ea)[0], (ea)[4], (ea)[5]
-#endif
-
+#define MAC2STRDBG(ea) (ea)[0], (ea)[4], (ea)[5]
+#endif /* SIMPLE_MAC_PRINT */
typedef struct bcm_bit_desc {
uint32 bit;