diff options
author | Joe Perches <joe@perches.com> | 2006-01-13 17:29:07 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-01-13 17:29:07 -0500 |
commit | 46b86a2da0fd14bd49765330df63a62279833acb (patch) | |
tree | 069b4741a970db9b03772a870b4d63398b1f56e0 /net/ipv6/ndisc.c | |
parent | 23b0ca5bf52cef0ab0f0fe247cb91cbef836e7eb (diff) |
[NET]: Use NIP6_FMT in kernel.h
There are errors and inconsistency in the display of NIP6 strings.
ie: net/ipv6/ip6_flowlabel.c
There are errors and inconsistency in the display of NIPQUAD strings too.
ie: net/netfilter/nf_conntrack_ftp.c
This patch:
adds NIP6_FMT to kernel.h
changes all code to use NIP6_FMT
fixes net/ipv6/ip6_flowlabel.c
adds NIPQUAD_FMT to kernel.h
fixes net/netfilter/nf_conntrack_ftp.c
changes a few uses of "%u.%u.%u.%u" to NIPQUAD_FMT for symmetry to NIP6_FMT
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ndisc.c')
-rw-r--r-- | net/ipv6/ndisc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 305d9ee6d7db..cb8856b1d951 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -692,7 +692,7 @@ static void ndisc_solicit(struct neighbour *neigh, struct sk_buff *skb) | |||
692 | if (!(neigh->nud_state & NUD_VALID)) { | 692 | if (!(neigh->nud_state & NUD_VALID)) { |
693 | ND_PRINTK1(KERN_DEBUG | 693 | ND_PRINTK1(KERN_DEBUG |
694 | "%s(): trying to ucast probe in NUD_INVALID: " | 694 | "%s(): trying to ucast probe in NUD_INVALID: " |
695 | "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", | 695 | NIP6_FMT "\n", |
696 | __FUNCTION__, | 696 | __FUNCTION__, |
697 | NIP6(*target)); | 697 | NIP6(*target)); |
698 | } | 698 | } |