Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 183453
b: refs/heads/master
c: bc7259a
h: refs/heads/master
i:
  183451: 6ab366f
v: v3
  • Loading branch information
Joe Perches authored and David S. Miller committed Jan 8, 2010
1 parent 007137f commit 757b19a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cf30273bea4a9d368a31869ccc6ad618e4413b66
refs/heads/master: bc7259a2ce764ea16200eb9e53f6e136e918d065
20 changes: 18 additions & 2 deletions trunk/lib/vsprintf.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <linux/kallsyms.h>
#include <linux/uaccess.h>
#include <linux/ioport.h>
#include <linux/bitrev.h>
#include <net/addrconf.h>

#include <asm/page.h> /* for PAGE_SIZE */
Expand Down Expand Up @@ -681,11 +682,21 @@ static char *mac_address_string(char *buf, char *end, u8 *addr,
char mac_addr[sizeof("xx:xx:xx:xx:xx:xx")];
char *p = mac_addr;
int i;
bool bitrev;
char separator;

if (fmt[1] == 'F') { /* FDDI canonical format */
bitrev = true;
separator = '-';
} else {
bitrev = false;
separator = ':';
}

for (i = 0; i < 6; i++) {
p = pack_hex_byte(p, addr[i]);
p = pack_hex_byte(p, bitrev ? bitrev8(addr[i]) : addr[i]);
if (fmt[0] == 'M' && i != 5)
*p++ = ':';
*p++ = separator;
}
*p = '\0';

Expand Down Expand Up @@ -896,6 +907,10 @@ static char *uuid_string(char *buf, char *end, const u8 *addr,
* - 'M' For a 6-byte MAC address, it prints the address in the
* usual colon-separated hex notation
* - 'm' For a 6-byte MAC address, it prints the hex address without colons
* - 'MF' For a 6-byte MAC FDDI address, it prints the address
* with a dash-separated hex notation with bit reversed bytes
* - 'mF' For a 6-byte MAC FDDI address, it prints the address
* in hex notation without separators with bit reversed bytes
* - 'I' [46] for IPv4/IPv6 addresses printed in the usual way
* IPv4 uses dot-separated decimal without leading 0's (1.2.3.4)
* IPv6 uses colon separated network-order 16 bit hex with leading 0's
Expand Down Expand Up @@ -939,6 +954,7 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
return resource_string(buf, end, ptr, spec, fmt);
case 'M': /* Colon separated: 00:01:02:03:04:05 */
case 'm': /* Contiguous: 000102030405 */
/* [mM]F (FDDI, bit reversed) */
return mac_address_string(buf, end, ptr, spec, fmt);
case 'I': /* Formatted IP supported
* 4: 1.2.3.4
Expand Down

0 comments on commit 757b19a

Please sign in to comment.