aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/bcmdhd/include/bcmutils.h
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-22 15:04:56 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-22 15:04:56 +0200
commitb99374450c03bf5081b88995d91d34fb9b2fd040 (patch)
treeb6f525d915504ad8bd99bdb2dadcca345a4ad3a3 /drivers/net/wireless/bcmdhd/include/bcmutils.h
parenta39819e88ea4546218b581d7f061a99ca91d825b (diff)
parente2f984e707f517f24041b70018770b20b71cb6a6 (diff)
downloadkernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.zip
kernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.tar.gz
kernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.tar.bz2
Merge remote-tracking branch 'github/cm-11.0'
Conflicts: firmware/Makefile firmware/epen/W9001_B713.bin.ihex firmware/epen/W9001_B746.bin.ihex firmware/epen/W9001_B746JD.bin.ihex firmware/epen/W9001_B746L.bin.ihex firmware/epen/W9001_B746S.bin.ihex
Diffstat (limited to 'drivers/net/wireless/bcmdhd/include/bcmutils.h')
-rw-r--r--drivers/net/wireless/bcmdhd/include/bcmutils.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcmdhd/include/bcmutils.h b/drivers/net/wireless/bcmdhd/include/bcmutils.h
index 1b21327..90f8f40 100644
--- a/drivers/net/wireless/bcmdhd/include/bcmutils.h
+++ b/drivers/net/wireless/bcmdhd/include/bcmutils.h
@@ -669,7 +669,8 @@ extern void *_bcmutils_dummy_fn;
#define CRC32_GOOD_VALUE 0xdebb20e3
-#define MACF "%02x:%02x:%02x:%02x:%02x:%02x"
+#define MACF "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx"
+#define MACF_U "%02hhX:%02hhX:%02hhX:%02hhX:%02hhX:%02hhX" /* upper case hex */
#define ETHERP_TO_MACF(ea) ((struct ether_addr *) (ea))->octet[0], \
((struct ether_addr *) (ea))->octet[1], \
((struct ether_addr *) (ea))->octet[2], \