diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-10-31 03:56:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:56:49 -0400 |
commit | 3685f25de1b0447fff381c420de1e25bd57c9efb (patch) | |
tree | 90a5d87c0ced1b27f654606d50a9ff13ded6f862 /include/net | |
parent | be859405487324ed548f1ba11dc949b8230ab991 (diff) |
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>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/ip_vs.h | 4 | ||||
-rw-r--r-- | include/net/netfilter/nf_conntrack_tuple.h | 6 | ||||
-rw-r--r-- | include/net/sctp/sctp.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index af48cada561e..fc63353779f0 100644 --- 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, | |||
91 | &addr->in6) + 1; | 91 | &addr->in6) + 1; |
92 | else | 92 | else |
93 | #endif | 93 | #endif |
94 | len = snprintf(&buf[*idx], buf_len - *idx, NIPQUAD_FMT, | 94 | len = snprintf(&buf[*idx], buf_len - *idx, "%pI4", |
95 | NIPQUAD(addr->ip)) + 1; | 95 | &addr->ip) + 1; |
96 | 96 | ||
97 | *idx += len; | 97 | *idx += len; |
98 | BUG_ON(*idx > buf_len + 1); | 98 | 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 42f1fc96f3ec..f2f6aa73dc10 100644 --- 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 | |||
112 | static inline void nf_ct_dump_tuple_ip(const struct nf_conntrack_tuple *t) | 112 | static inline void nf_ct_dump_tuple_ip(const struct nf_conntrack_tuple *t) |
113 | { | 113 | { |
114 | #ifdef DEBUG | 114 | #ifdef DEBUG |
115 | printk("tuple %p: %u " NIPQUAD_FMT ":%hu -> " NIPQUAD_FMT ":%hu\n", | 115 | printk("tuple %p: %u %pI4:%hu -> %pI4:%hu\n", |
116 | t, t->dst.protonum, | 116 | t, t->dst.protonum, |
117 | NIPQUAD(t->src.u3.ip), ntohs(t->src.u.all), | 117 | &t->src.u3.ip, ntohs(t->src.u.all), |
118 | NIPQUAD(t->dst.u3.ip), ntohs(t->dst.u.all)); | 118 | &t->dst.u3.ip, ntohs(t->dst.u.all)); |
119 | #endif | 119 | #endif |
120 | } | 120 | } |
121 | 121 | ||
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index e71b0f7ce88e..23797506f593 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
@@ -291,9 +291,9 @@ extern int sctp_debug_flag; | |||
291 | otherparms); \ | 291 | otherparms); \ |
292 | } else { \ | 292 | } else { \ |
293 | printk(KERN_DEBUG \ | 293 | printk(KERN_DEBUG \ |
294 | lead NIPQUAD_FMT trail, \ | 294 | lead "%pI4" trail, \ |
295 | leadparm, \ | 295 | leadparm, \ |
296 | NIPQUAD(saddr->v4.sin_addr.s_addr), \ | 296 | &saddr->v4.sin_addr.s_addr, \ |
297 | otherparms); \ | 297 | otherparms); \ |
298 | } \ | 298 | } \ |
299 | } | 299 | } |