Patchwork [4/4] printk: remove %p6 format specifier, fix up comments

login
register
mail settings
Submitter Harvey Harrison
Date Oct. 29, 2008, 6:35 p.m.
Message ID <1225305342.5688.39.camel@brick>
Download mbox | patch
Permalink /patch/6292/
State Accepted
Delegated to: David Miller
Headers show

Comments

Harvey Harrison - Oct. 29, 2008, 6:35 p.m.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 lib/vsprintf.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
David Miller - Oct. 29, 2008, 8:04 p.m.
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Wed, 29 Oct 2008 11:35:42 -0700

> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index a863006..dd7cc7f 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -649,9 +649,7 @@  static char *ip4_addr_string(char *buf, char *end, u8 *addr, int field_width,
  * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way (dot-separated
  *       decimal for v4 and colon separated network-order 16 bit hex for v6)
  * - 'i' [46] for 'raw' IPv4/IPv6 addresses, IPv6 omits the colons, IPv4 is
-         currently the same
- * - '6' For a IPv6 address prints the address in network-ordered 16 bit hex
- *       with colon separators
+ *       currently the same
  *
  * Note: The difference between 'S' and 'F' is that on ia64 and ppc64
  * function pointers are really function descriptors, which contain a
@@ -669,8 +667,6 @@  static char *pointer(const char *fmt, char *buf, char *end, void *ptr, int field
 		return resource_string(buf, end, ptr, field_width, precision, flags);
 	case 'M':
 		return mac_address_string(buf, end, ptr, field_width, precision, flags);
-	case '6':
-		return ip6_addr_string(buf, end, ptr, field_width, precision, flags);
 	case 'i':
 		flags |= SPECIAL;
 		/* Fallthrough */