diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-10-28 16:08:13 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-28 16:08:13 -0700 |
commit | 38ff4fa49bef77e86b21d95d9ce341a098f02839 (patch) | |
tree | 9c1b370a8d81410296719325a9b8264200e1af72 /net/netfilter/ipvs/ip_vs_proto.c | |
parent | 1afa67f5e70b4733d5b237df61e6d639af6283bb (diff) | |
download | kernel_samsung_smdk4412-38ff4fa49bef77e86b21d95d9ce341a098f02839.zip kernel_samsung_smdk4412-38ff4fa49bef77e86b21d95d9ce341a098f02839.tar.gz kernel_samsung_smdk4412-38ff4fa49bef77e86b21d95d9ce341a098f02839.tar.bz2 |
netfilter: replace uses of NIP6_FMT with %p6
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_proto.c')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_proto.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c index 0791f9e..d7ce4f1 100644 --- a/net/netfilter/ipvs/ip_vs_proto.c +++ b/net/netfilter/ipvs/ip_vs_proto.c @@ -203,26 +203,21 @@ ip_vs_tcpudp_debug_packet_v6(struct ip_vs_protocol *pp, if (ih == NULL) sprintf(buf, "%s TRUNCATED", pp->name); else if (ih->nexthdr == IPPROTO_FRAGMENT) - sprintf(buf, "%s " NIP6_FMT "->" NIP6_FMT " frag", - pp->name, NIP6(ih->saddr), - NIP6(ih->daddr)); + sprintf(buf, "%s %p6->%p6 frag", + pp->name, &ih->saddr, &ih->daddr); else { __be16 _ports[2], *pptr; pptr = skb_header_pointer(skb, offset + sizeof(struct ipv6hdr), sizeof(_ports), _ports); if (pptr == NULL) - sprintf(buf, "%s TRUNCATED " NIP6_FMT "->" NIP6_FMT, - pp->name, - NIP6(ih->saddr), - NIP6(ih->daddr)); + sprintf(buf, "%s TRUNCATED %p6->%p6", + pp->name, &ih->saddr, &ih->daddr); else - sprintf(buf, "%s " NIP6_FMT ":%u->" NIP6_FMT ":%u", + sprintf(buf, "%s %p6:%u->%p6:%u", pp->name, - NIP6(ih->saddr), - ntohs(pptr[0]), - NIP6(ih->daddr), - ntohs(pptr[1])); + &ih->saddr, ntohs(pptr[0]), + &ih->daddr, ntohs(pptr[1])); } printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf); |