misc: replace NIPQUAD()

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>

diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index 51cb75ea42d57367b37403e1d02f2f6399a4a7ab..0127daca43548c85c219abc6445101165380eef9 100644 (file)
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -139,8 +139,8 @@ static inline char *__svc_print_addr(struct sockaddr *addr,
 {
        switch (addr->sa_family) {
        case AF_INET:
-               snprintf(buf, len, "%u.%u.%u.%u, port=%u",
-                       NIPQUAD(((struct sockaddr_in *) addr)->sin_addr),
+               snprintf(buf, len, "%pI4, port=%u",
+                       &((struct sockaddr_in *)addr)->sin_addr,
                        ntohs(((struct sockaddr_in *) addr)->sin_port));
                break;
 

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index af48cada561e5089932f4246e265df0792c0e1f9..fc63353779f0ef6521f502113e4a7d4b407f93ff 100644 (file)
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -91,8 +91,8 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len,
                               &addr->in6) + 1;
        else
 #endif
-               len = snprintf(&buf[*idx], buf_len - *idx, NIPQUAD_FMT,
-                              NIPQUAD(addr->ip)) + 1;
+               len = snprintf(&buf[*idx], buf_len - *idx, "%pI4",
+                              &addr->ip) + 1;
 
        *idx += len;
        BUG_ON(*idx > buf_len + 1);

diff --git a/include/net/netfilter/nf_conntrack_tuple.h b/include/net/netfilter/nf_conntrack_tuple.h
index 42f1fc96f3ec34cbc83603032818b95e82c8fed8..f2f6aa73dc10fd3ec65d3428118c486c2b51b20a 100644 (file)
--- a/include/net/netfilter/nf_conntrack_tuple.h
+++ b/include/net/netfilter/nf_conntrack_tuple.h
@@ -112,10 +112,10 @@ struct nf_conntrack_tuple_mask
 static inline void nf_ct_dump_tuple_ip(const struct nf_conntrack_tuple *t)
 {
 #ifdef DEBUG
-       printk("tuple %p: %u " NIPQUAD_FMT ":%hu -> " NIPQUAD_FMT ":%hu\n",
+       printk("tuple %p: %u %pI4:%hu -> %pI4:%hu\n",
               t, t->dst.protonum,
-              NIPQUAD(t->src.u3.ip), ntohs(t->src.u.all),
-              NIPQUAD(t->dst.u3.ip), ntohs(t->dst.u.all));
+              &t->src.u3.ip, ntohs(t->src.u.all),
+              &t->dst.u3.ip, ntohs(t->dst.u.all));
 #endif
 }
 

diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index e71b0f7ce88edec17ec7a672442b16b6abdf13a6..23797506f593e87af3df9171ab75929513085278 100644 (file)
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -291,9 +291,9 @@ extern int sctp_debug_flag;
                               otherparms); \
                } else { \
                        printk(KERN_DEBUG \
-                              lead NIPQUAD_FMT trail, \
+                              lead "%pI4" trail, \
                               leadparm, \
-                              NIPQUAD(saddr->v4.sin_addr.s_addr), \
+                              &saddr->v4.sin_addr.s_addr, \
                               otherparms); \
                } \
        }

diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index ed6af12cdf4309c9771deb108559bf9e58de1215..d43bd6baeeaa9e1c4526d1fd8a82eaf57c9472c8 100644 (file)
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -504,7 +504,7 @@ static inline void avc_print_ipv4_addr(struct audit_buffer *ab, __be32 addr,
                                       __be16 port, char *name1, char *name2)
 {
        if (addr)
-               audit_log_format(ab, " %s=" NIPQUAD_FMT, name1, NIPQUAD(addr));
+               audit_log_format(ab, " %s=%pI4", name1, &addr);
        if (port)
                audit_log_format(ab, " %s=%d", name2, ntohs(port));
 }