net: replace NIPQUAD() in net/netfilter/

Using NIPQUAD() with NIPQUAD_FMT, %d.%d.%d.%d or %u.%u.%u.%u
can be replaced with %pI4

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 7 deletions

diff --git a/net/netfilter/nf_conntrack_irc.c b/net/netfilter/nf_conntrack_irc.c
index 20633fdf7e6..4d681a04447 100644
--- a/net/netfilter/nf_conntrack_irc.c
+++ b/net/netfilter/nf_conntrack_irc.c
@@ -156,9 +156,9 @@ static int help(struct sk_buff *skb, unsigned int protoff,
                 /* we have at least (19+MINMATCHLEN)-5 bytes valid data left */
 
                 iph = ip_hdr(skb);
-                pr_debug("DCC found in master %u.%u.%u.%u:%u %u.%u.%u.%u:%u\n",
-                         NIPQUAD(iph->saddr), ntohs(th->source),
-                         NIPQUAD(iph->daddr), ntohs(th->dest));
+                pr_debug("DCC found in master %pI4:%u %pI4:%u\n",
+                         &iph->saddr, ntohs(th->source),
+                         &iph->daddr, ntohs(th->dest));
 
                 for (i = 0; i < ARRAY_SIZE(dccprotos); i++) {
                         if (memcmp(data, dccprotos[i], strlen(dccprotos[i]))) {
@@ -185,10 +185,9 @@ static int help(struct sk_buff *skb, unsigned int protoff,
                             tuple->dst.u3.ip != htonl(dcc_ip)) {
                                 if (net_ratelimit())
                                         printk(KERN_WARNING
-                                                "Forged DCC command from "
-                                                "%u.%u.%u.%u: %u.%u.%u.%u:%u\n",
-                                                NIPQUAD(tuple->src.u3.ip),
-                                                HIPQUAD(dcc_ip), dcc_port);
+                                                "Forged DCC command from %pI4: %pI4:%u\n",
+                                                &tuple->src.u3.ip,
+                                                &dcc_ip, dcc_port);
                                 continue;
                         }