net: replace NIPQUAD() in net/ipv4/ net/ipv6/

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, 10 insertions, 14 deletions

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index e9d6ea0b49ca..21e497efbd7f 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -683,10 +683,8 @@ static void icmp_unreach(struct sk_buff *skb)
                         break;
                 case ICMP_FRAG_NEEDED:
                         if (ipv4_config.no_pmtu_disc) {
-                                LIMIT_NETDEBUG(KERN_INFO "ICMP: " NIPQUAD_FMT ": "
-                                                         "fragmentation needed "
-                                                         "and DF set.\n",
-                                               NIPQUAD(iph->daddr));
+                                LIMIT_NETDEBUG(KERN_INFO "ICMP: %pI4: fragmentation needed and DF set.\n",
+                                               &iph->daddr);
                         } else {
                                 info = ip_rt_frag_needed(net, iph,
                                                          ntohs(icmph->un.frag.mtu),
@@ -696,9 +694,8 @@ static void icmp_unreach(struct sk_buff *skb)
                         }
                         break;
                 case ICMP_SR_FAILED:
-                        LIMIT_NETDEBUG(KERN_INFO "ICMP: " NIPQUAD_FMT ": Source "
-                                                 "Route Failed.\n",
-                                       NIPQUAD(iph->daddr));
+                        LIMIT_NETDEBUG(KERN_INFO "ICMP: %pI4: Source Route Failed.\n",
+                                       &iph->daddr);
                         break;
                 default:
                         break;
@@ -729,12 +726,12 @@ static void icmp_unreach(struct sk_buff *skb)
         if (!net->ipv4.sysctl_icmp_ignore_bogus_error_responses &&
             inet_addr_type(net, iph->daddr) == RTN_BROADCAST) {
                 if (net_ratelimit())
-                        printk(KERN_WARNING NIPQUAD_FMT " sent an invalid ICMP "
+                        printk(KERN_WARNING "%pI4 sent an invalid ICMP "
                                             "type %u, code %u "
-                                            "error to a broadcast: " NIPQUAD_FMT " on %s\n",
-                               NIPQUAD(ip_hdr(skb)->saddr),
+                                            "error to a broadcast: %pI4 on %s\n",
+                               &ip_hdr(skb)->saddr,
                                icmph->type, icmph->code,
-                               NIPQUAD(iph->daddr),
+                               &iph->daddr,
                                skb->dev->name);
                 goto out;
         }
@@ -952,9 +949,8 @@ static void icmp_address_reply(struct sk_buff *skb)
                                 break;
                 }
                 if (!ifa && net_ratelimit()) {
-                        printk(KERN_INFO "Wrong address mask " NIPQUAD_FMT " from "
-                                         "%s/" NIPQUAD_FMT "\n",
-                               NIPQUAD(*mp), dev->name, NIPQUAD(rt->rt_src));
+                        printk(KERN_INFO "Wrong address mask %pI4 from %s/%pI4\n",
+                               mp, dev->name, &rt->rt_src);
                 }
         }
         rcu_read_unlock();