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

[mirror_ubuntu-bionic-kernel.git] / net / ipv4 / tcp_ipv4.c

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 5c8fa7f1e327821dbcb378244e8674183025906c..ef33246e6a6fcdda6e59fbfa2dd8cb4f2479c19e 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1139,10 +1139,9 @@ static int tcp_v4_inbound_md5_hash(struct sock *sk, struct sk_buff *skb)
 
        if (genhash || memcmp(hash_location, newhash, 16) != 0) {
                if (net_ratelimit()) {
-                       printk(KERN_INFO "MD5 Hash failed for "
-                              "(" NIPQUAD_FMT ", %d)->(" NIPQUAD_FMT ", %d)%s\n",
-                              NIPQUAD(iph->saddr), ntohs(th->source),
-                              NIPQUAD(iph->daddr), ntohs(th->dest),
+                       printk(KERN_INFO "MD5 Hash failed for (%pI4, %d)->(%pI4, %d)%s\n",
+                              &iph->saddr, ntohs(th->source),
+                              &iph->daddr, ntohs(th->dest),
                               genhash ? " tcp_v4_calc_md5_hash failed" : "");
                }
                return 1;
@@ -1297,10 +1296,8 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
                         * to destinations, already remembered
                         * to the moment of synflood.
                         */
-                       LIMIT_NETDEBUG(KERN_DEBUG "TCP: drop open "
-                                      "request from " NIPQUAD_FMT "/%u\n",
-                                      NIPQUAD(saddr),
-                                      ntohs(tcp_hdr(skb)->source));
+                       LIMIT_NETDEBUG(KERN_DEBUG "TCP: drop open request from %pI4/%u\n",
+                                      &saddr, ntohs(tcp_hdr(skb)->source));
                        goto drop_and_release;
                }