diff options
| author | Joe Perches <joe@perches.com> | 2010-01-11 00:44:14 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-11 00:44:14 -0800 |
| commit | c8e000604bce02a87742240a9b716a0f1b680c0b (patch) | |
| tree | 8650e2d3ed439349e75272969989a897121e48ba /lib/vsprintf.c | |
| parent | d4a66e752d0b19934dd208884f8605fe385aaaa9 (diff) | |
| download | lwn-c8e000604bce02a87742240a9b716a0f1b680c0b.tar.gz lwn-c8e000604bce02a87742240a9b716a0f1b680c0b.zip | |
lib: Kill bit-reversed FDDI MAC output case, it's bogus.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/vsprintf.c')
| -rw-r--r-- | lib/vsprintf.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index dc48d2b32ebd..e83e3e79a989 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -25,7 +25,6 @@ #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 */ @@ -682,19 +681,16 @@ 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, bitrev ? bitrev8(addr[i]) : addr[i]); + p = pack_hex_byte(p, addr[i]); if (fmt[0] == 'M' && i != 5) *p++ = separator; } @@ -908,9 +904,7 @@ static char *uuid_string(char *buf, char *end, const u8 *addr, * 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 + * with a dash-separated hex notation * - '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 |