aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-10-27 18:47:12 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-27 20:06:15 -0400
commitdd45c9cf687682c9ce256ab14bd8914db77410bb (patch)
tree0769c1655b55f2528e9aaf8f96ba8d856f72f0ca /lib
parent1080d709fb9d8cd4392f93476ee46a9d6ea05a5b (diff)
printk: add %pM format specifier for MAC addresses
Add format specifiers for printing out six colon-separated bytes: MAC addresses (%pM): xx:xx:xx:xx:xx:xx %#pM is also supported and omits the colon separators. Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib')
-rw-r--r--lib/vsprintf.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index a013bbc23717..0deaaaf2b14e 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -581,6 +581,23 @@ static char *resource_string(char *buf, char *end, struct resource *res, int fie
581 return string(buf, end, sym, field_width, precision, flags); 581 return string(buf, end, sym, field_width, precision, flags);
582} 582}
583 583
584static char *mac_address_string(char *buf, char *end, u8 *addr, int field_width,
585 int precision, int flags)
586{
587 char mac_addr[6 * 3]; /* (6 * 2 hex digits), 5 colons and trailing zero */
588 char *p = mac_addr;
589 int i;
590
591 for (i = 0; i < 6; i++) {
592 p = pack_hex_byte(p, addr[i]);
593 if (!(flags & SPECIAL) && i != 5)
594 *p++ = ':';
595 }
596 *p = '\0';
597
598 return string(buf, end, mac_addr, field_width, precision, flags & ~SPECIAL);
599}
600
584/* 601/*
585 * Show a '%p' thing. A kernel extension is that the '%p' is followed 602 * Show a '%p' thing. A kernel extension is that the '%p' is followed
586 * by an extra set of alphanumeric characters that are extended format 603 * by an extra set of alphanumeric characters that are extended format
@@ -592,6 +609,8 @@ static char *resource_string(char *buf, char *end, struct resource *res, int fie
592 * - 'S' For symbolic direct pointers 609 * - 'S' For symbolic direct pointers
593 * - 'R' For a struct resource pointer, it prints the range of 610 * - 'R' For a struct resource pointer, it prints the range of
594 * addresses (not the name nor the flags) 611 * addresses (not the name nor the flags)
612 * - 'M' For a 6-byte MAC address, it prints the address in the
613 * usual colon-separated hex notation
595 * 614 *
596 * Note: The difference between 'S' and 'F' is that on ia64 and ppc64 615 * Note: The difference between 'S' and 'F' is that on ia64 and ppc64
597 * function pointers are really function descriptors, which contain a 616 * function pointers are really function descriptors, which contain a
@@ -607,6 +626,8 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr, int field
607 return symbol_string(buf, end, ptr, field_width, precision, flags); 626 return symbol_string(buf, end, ptr, field_width, precision, flags);
608 case 'R': 627 case 'R':
609 return resource_string(buf, end, ptr, field_width, precision, flags); 628 return resource_string(buf, end, ptr, field_width, precision, flags);
629 case 'M':
630 return mac_address_string(buf, end, ptr, field_width, precision, flags);
610 } 631 }
611 flags |= SMALL; 632 flags |= SMALL;
612 if (field_width == -1) { 633 if (field_width == -1) {