diff options
author | Joe Perches <joe@perches.com> | 2010-01-11 03:44:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-11 03:44:14 -0500 |
commit | c8e000604bce02a87742240a9b716a0f1b680c0b (patch) | |
tree | 8650e2d3ed439349e75272969989a897121e48ba /lib/vsprintf.c | |
parent | d4a66e752d0b19934dd208884f8605fe385aaaa9 (diff) |
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 @@ | |||
25 | #include <linux/kallsyms.h> | 25 | #include <linux/kallsyms.h> |
26 | #include <linux/uaccess.h> | 26 | #include <linux/uaccess.h> |
27 | #include <linux/ioport.h> | 27 | #include <linux/ioport.h> |
28 | #include <linux/bitrev.h> | ||
29 | #include <net/addrconf.h> | 28 | #include <net/addrconf.h> |
30 | 29 | ||
31 | #include <asm/page.h> /* for PAGE_SIZE */ | 30 | #include <asm/page.h> /* for PAGE_SIZE */ |
@@ -682,19 +681,16 @@ static char *mac_address_string(char *buf, char *end, u8 *addr, | |||
682 | char mac_addr[sizeof("xx:xx:xx:xx:xx:xx")]; | 681 | char mac_addr[sizeof("xx:xx:xx:xx:xx:xx")]; |
683 | char *p = mac_addr; | 682 | char *p = mac_addr; |
684 | int i; | 683 | int i; |
685 | bool bitrev; | ||
686 | char separator; | 684 | char separator; |
687 | 685 | ||
688 | if (fmt[1] == 'F') { /* FDDI canonical format */ | 686 | if (fmt[1] == 'F') { /* FDDI canonical format */ |
689 | bitrev = true; | ||
690 | separator = '-'; | 687 | separator = '-'; |
691 | } else { | 688 | } else { |
692 | bitrev = false; | ||
693 | separator = ':'; | 689 | separator = ':'; |
694 | } | 690 | } |
695 | 691 | ||
696 | for (i = 0; i < 6; i++) { | 692 | for (i = 0; i < 6; i++) { |
697 | p = pack_hex_byte(p, bitrev ? bitrev8(addr[i]) : addr[i]); | 693 | p = pack_hex_byte(p, addr[i]); |
698 | if (fmt[0] == 'M' && i != 5) | 694 | if (fmt[0] == 'M' && i != 5) |
699 | *p++ = separator; | 695 | *p++ = separator; |
700 | } | 696 | } |
@@ -908,9 +904,7 @@ static char *uuid_string(char *buf, char *end, const u8 *addr, | |||
908 | * usual colon-separated hex notation | 904 | * usual colon-separated hex notation |
909 | * - 'm' For a 6-byte MAC address, it prints the hex address without colons | 905 | * - 'm' For a 6-byte MAC address, it prints the hex address without colons |
910 | * - 'MF' For a 6-byte MAC FDDI address, it prints the address | 906 | * - 'MF' For a 6-byte MAC FDDI address, it prints the address |
911 | * with a dash-separated hex notation with bit reversed bytes | 907 | * with a dash-separated hex notation |
912 | * - 'mF' For a 6-byte MAC FDDI address, it prints the address | ||
913 | * in hex notation without separators with bit reversed bytes | ||
914 | * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way | 908 | * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way |
915 | * IPv4 uses dot-separated decimal without leading 0's (1.2.3.4) | 909 | * IPv4 uses dot-separated decimal without leading 0's (1.2.3.4) |
916 | * IPv6 uses colon separated network-order 16 bit hex with leading 0's | 910 | * IPv6 uses colon separated network-order 16 bit hex with leading 0's |