diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 17:32:22 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 17:32:22 -0800 |
commit | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (patch) | |
tree | d938e61f953ca63a745e7ace4a78c16876509ed5 /net/ipv6/addrconf.c | |
parent | 8f28afac3494f573ac774030a1f840b7d6237da2 (diff) | |
parent | 3860288ee8298bf2784e9a0c37d26d3a82941e35 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r-- | net/ipv6/addrconf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index dfb4f145a13..d328d598614 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2644,7 +2644,7 @@ static int if6_seq_show(struct seq_file *seq, void *v) { struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v; seq_printf(seq, - NIP6_FMT " %02x %02x %02x %02x %8s\n", + NIP6_SEQFMT " %02x %02x %02x %02x %8s\n", NIP6(ifp->addr), ifp->idev->dev->ifindex, ifp->prefix_len, |