Skip to content

L
linux-davinci-2.6.23
Commit 33e93c96 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files
Options

[IPV6] ROUTE: Use macros to format /proc/net/ipv6_route. 

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
parent d83ca5ac
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 24 deletions
net/ipv6/route.c
View file @ 33e93c96
......@@ -2246,7 +2246,6 @@ struct rt6_proc_arg
static int rt6_info_route(struct rt6_info *rt, void *p_arg)
{
struct rt6_proc_arg *arg = (struct rt6_proc_arg *) p_arg;
int i;
if (arg->skip < arg->offset / RT6_INFO_LEN) {
arg->skip++;
......@@ -2256,38 +2255,28 @@ static int rt6_info_route(struct rt6_info *rt, void *p_arg)
if (arg->len >= arg->length)
return 0;
for (i=0; i<16; i++) {
sprintf(arg->buffer + arg->len, "%02x",
rt->rt6i_dst.addr.s6_addr[i]);
arg->len += 2;
}
arg->len += sprintf(arg->buffer + arg->len, " %02x ",
arg->len += sprintf(arg->buffer + arg->len,
NIP6_SEQFMT " %02x ",
NIP6(rt->rt6i_dst.addr),
rt->rt6i_dst.plen);
#ifdef CONFIG_IPV6_SUBTREES
for (i=0; i<16; i++) {
sprintf(arg->buffer + arg->len, "%02x",
rt->rt6i_src.addr.s6_addr[i]);
arg->len += 2;
}
arg->len += sprintf(arg->buffer + arg->len, " %02x ",
arg->len += sprintf(arg->buffer + arg->len,
NIP6_SEQFMT " %02x ",
NIP6(rt->rt6i_src.addr),
rt->rt6i_src.plen);
#else
sprintf(arg->buffer + arg->len,
arg->len += sprintf(arg->buffer + arg->len,
"00000000000000000000000000000000 00 ");
arg->len += 36;
#endif
if (rt->rt6i_nexthop) {
for (i=0; i<16; i++) {
sprintf(arg->buffer + arg->len, "%02x",
rt->rt6i_nexthop->primary_key[i]);
arg->len += 2;
}
arg->len += sprintf(arg->buffer + arg->len,
NIP6_SEQFMT,
NIP6(*((struct in6_addr *)rt->rt6i_nexthop->primary_key)));
} else {
sprintf(arg->buffer + arg->len,
arg->len += sprintf(arg->buffer + arg->len,
"00000000000000000000000000000000");
arg->len += 32;
}
arg->len += sprintf(arg->buffer + arg->len,
" %08x %08x %08x %08x %8s\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment