Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3685f25d authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

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: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent be859405

include/linux/sunrpc/svc_xprt.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

include/net/ip_vs.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

include/net/netfilter/nf_conntrack_tuple.h

+3 −3
Original line number Diff line number Diff line
@@ -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

}

include/net/sctp/sctp.h

+2 −2
Original line number Diff line number Diff line
@@ -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); \

		} \

	}

security/selinux/avc.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

}