diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/addrconf.c | 2 | ||||
-rw-r--r-- | net/ipv6/anycast.c | 2 | ||||
-rw-r--r-- | net/ipv6/ip6_flowlabel.c | 2 | ||||
-rw-r--r-- | net/ipv6/mcast.c | 4 | ||||
-rw-r--r-- | net/ipv6/route.c | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 113c4d93153d..ff7ae05f72e1 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -2986,7 +2986,7 @@ static void if6_seq_stop(struct seq_file *seq, void *v) | |||
2986 | static int if6_seq_show(struct seq_file *seq, void *v) | 2986 | static int if6_seq_show(struct seq_file *seq, void *v) |
2987 | { | 2987 | { |
2988 | struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v; | 2988 | struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v; |
2989 | seq_printf(seq, "%#p6 %02x %02x %02x %02x %8s\n", | 2989 | seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n", |
2990 | &ifp->addr, | 2990 | &ifp->addr, |
2991 | ifp->idev->dev->ifindex, | 2991 | ifp->idev->dev->ifindex, |
2992 | ifp->prefix_len, | 2992 | ifp->prefix_len, |
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c index ae494e30e555..1ae58bec1de0 100644 --- a/net/ipv6/anycast.c +++ b/net/ipv6/anycast.c | |||
@@ -512,7 +512,7 @@ static int ac6_seq_show(struct seq_file *seq, void *v) | |||
512 | struct ifacaddr6 *im = (struct ifacaddr6 *)v; | 512 | struct ifacaddr6 *im = (struct ifacaddr6 *)v; |
513 | struct ac6_iter_state *state = ac6_seq_private(seq); | 513 | struct ac6_iter_state *state = ac6_seq_private(seq); |
514 | 514 | ||
515 | seq_printf(seq, "%-4d %-15s %#p6 %5d\n", | 515 | seq_printf(seq, "%-4d %-15s %pi6 %5d\n", |
516 | state->dev->ifindex, state->dev->name, | 516 | state->dev->ifindex, state->dev->name, |
517 | &im->aca_addr, im->aca_users); | 517 | &im->aca_addr, im->aca_users); |
518 | return 0; | 518 | return 0; |
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index d57102353500..7927a8498d17 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c | |||
@@ -696,7 +696,7 @@ static int ip6fl_seq_show(struct seq_file *seq, void *v) | |||
696 | else { | 696 | else { |
697 | struct ip6_flowlabel *fl = v; | 697 | struct ip6_flowlabel *fl = v; |
698 | seq_printf(seq, | 698 | seq_printf(seq, |
699 | "%05X %-1d %-6d %-6d %-6ld %-8ld %#p6 %-4d\n", | 699 | "%05X %-1d %-6d %-6d %-6ld %-8ld %pi6 %-4d\n", |
700 | (unsigned)ntohl(fl->label), | 700 | (unsigned)ntohl(fl->label), |
701 | fl->share, | 701 | fl->share, |
702 | (unsigned)fl->owner, | 702 | (unsigned)fl->owner, |
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 4416cdc3e627..a76199ecad23 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c | |||
@@ -2430,7 +2430,7 @@ static int igmp6_mc_seq_show(struct seq_file *seq, void *v) | |||
2430 | struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq); | 2430 | struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq); |
2431 | 2431 | ||
2432 | seq_printf(seq, | 2432 | seq_printf(seq, |
2433 | "%-4d %-15s %#p6 %5d %08X %ld\n", | 2433 | "%-4d %-15s %pi6 %5d %08X %ld\n", |
2434 | state->dev->ifindex, state->dev->name, | 2434 | state->dev->ifindex, state->dev->name, |
2435 | &im->mca_addr, | 2435 | &im->mca_addr, |
2436 | im->mca_users, im->mca_flags, | 2436 | im->mca_users, im->mca_flags, |
@@ -2591,7 +2591,7 @@ static int igmp6_mcf_seq_show(struct seq_file *seq, void *v) | |||
2591 | "Source Address", "INC", "EXC"); | 2591 | "Source Address", "INC", "EXC"); |
2592 | } else { | 2592 | } else { |
2593 | seq_printf(seq, | 2593 | seq_printf(seq, |
2594 | "%3d %6.6s %#p6 %#p6 %6lu %6lu\n", | 2594 | "%3d %6.6s %pi6 %pi6 %6lu %6lu\n", |
2595 | state->dev->ifindex, state->dev->name, | 2595 | state->dev->ifindex, state->dev->name, |
2596 | &state->im->mca_addr, | 2596 | &state->im->mca_addr, |
2597 | &psf->sf_addr, | 2597 | &psf->sf_addr, |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 720bfedd3185..d69fa462d3f0 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -2408,16 +2408,16 @@ static int rt6_info_route(struct rt6_info *rt, void *p_arg) | |||
2408 | { | 2408 | { |
2409 | struct seq_file *m = p_arg; | 2409 | struct seq_file *m = p_arg; |
2410 | 2410 | ||
2411 | seq_printf(m, "%#p6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); | 2411 | seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); |
2412 | 2412 | ||
2413 | #ifdef CONFIG_IPV6_SUBTREES | 2413 | #ifdef CONFIG_IPV6_SUBTREES |
2414 | seq_printf(m, "%#p6 %02x ", &rt->rt6i_src.addr, rt->rt6i_src.plen); | 2414 | seq_printf(m, "%pi6 %02x ", &rt->rt6i_src.addr, rt->rt6i_src.plen); |
2415 | #else | 2415 | #else |
2416 | seq_puts(m, "00000000000000000000000000000000 00 "); | 2416 | seq_puts(m, "00000000000000000000000000000000 00 "); |
2417 | #endif | 2417 | #endif |
2418 | 2418 | ||
2419 | if (rt->rt6i_nexthop) { | 2419 | if (rt->rt6i_nexthop) { |
2420 | seq_printf(m, "%#p6", rt->rt6i_nexthop->primary_key); | 2420 | seq_printf(m, "%pi6", rt->rt6i_nexthop->primary_key); |
2421 | } else { | 2421 | } else { |
2422 | seq_puts(m, "00000000000000000000000000000000"); | 2422 | seq_puts(m, "00000000000000000000000000000000"); |
2423 | } | 2423 | } |