lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

misc: replace NIPQUAD()

Browse Source 
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>
This commit is contained in:
Harvey Harrison
2008-10-31 00:56:49 -07:00
committed by David S. Miller
parent be85940548
commit 3685f25de1
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/sunrpc/svc_xprt.h
View File

@@ -139,8 +139,8 @@ static inline char *__svc_print_addr(struct sockaddr *addr,
{ {
switch (addr->sa_family) { switch (addr->sa_family) {
case AF_INET: case AF_INET:
snprintf(buf, len, "%u.%u.%u.%u, port=%u", snprintf(buf, len, "%pI4, port=%u",
NIPQUAD(((struct sockaddr_in *) addr)->sin_addr), &((struct sockaddr_in *)addr)->sin_addr,
ntohs(((struct sockaddr_in *) addr)->sin_port)); ntohs(((struct sockaddr_in *) addr)->sin_port));
break; break;

4
include/net/ip_vs.h
View File

@@ -91,8 +91,8 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len,
&addr->in6) + 1; &addr->in6) + 1;
else else
#endif #endif
len = snprintf(&buf[*idx], buf_len - *idx, NIPQUAD_FMT, len = snprintf(&buf[*idx], buf_len - *idx, "%pI4",
NIPQUAD(addr->ip)) + 1; &addr->ip) + 1;
*idx += len; *idx += len;
BUG_ON(*idx > buf_len + 1); BUG_ON(*idx > buf_len + 1);

6
include/net/netfilter/nf_conntrack_tuple.h
View File

@@ -112,10 +112,10 @@ struct nf_conntrack_tuple_mask
static inline void nf_ct_dump_tuple_ip(const struct nf_conntrack_tuple *t) static inline void nf_ct_dump_tuple_ip(const struct nf_conntrack_tuple *t)
{ {
#ifdef DEBUG #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, t, t->dst.protonum,
NIPQUAD(t->src.u3.ip), ntohs(t->src.u.all), &t->src.u3.ip, ntohs(t->src.u.all),
NIPQUAD(t->dst.u3.ip), ntohs(t->dst.u.all)); &t->dst.u3.ip, ntohs(t->dst.u.all));
#endif #endif
} }

4
include/net/sctp/sctp.h
View File

@@ -291,9 +291,9 @@ extern int sctp_debug_flag;
otherparms); \ otherparms); \
} else { \ } else { \
printk(KERN_DEBUG \ printk(KERN_DEBUG \
lead NIPQUAD_FMT trail, \ lead "%pI4" trail, \
leadparm, \ leadparm, \
NIPQUAD(saddr->v4.sin_addr.s_addr), \ &saddr->v4.sin_addr.s_addr, \
otherparms); \ otherparms); \
} \ } \
} }

2
security/selinux/avc.c
View File

@@ -504,7 +504,7 @@ static inline void avc_print_ipv4_addr(struct audit_buffer *ab, __be32 addr,
__be16 port, char *name1, char *name2) __be16 port, char *name1, char *name2)
{ {
if (addr) if (addr)
audit_log_format(ab, " %s=" NIPQUAD_FMT, name1, NIPQUAD(addr)); audit_log_format(ab, " %s=%pI4", name1, &addr);
if (port) if (port)
audit_log_format(ab, " %s=%d", name2, ntohs(port)); audit_log_format(ab, " %s=%d", name2, ntohs(port));
} }