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

Commit 0c6ce78a authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

net: replace uses of NIP6_FMT with %p6 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 38ff4fa4

include/linux/sunrpc/svc_xprt.h

+2 −2
Original line number Diff line number Diff line
@@ -145,8 +145,8 @@ static inline char *__svc_print_addr(struct sockaddr *addr, 
		break;



	case AF_INET6:

		snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x, port=%u",

			NIP6(((struct sockaddr_in6 *) addr)->sin6_addr),

		snprintf(buf, len, "%p6, port=%u",

			 &((struct sockaddr_in6 *)addr)->sin6_addr,

			ntohs(((struct sockaddr_in6 *) addr)->sin6_port));

		break;

include/net/ip_vs.h

+2 −2
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len, 
	int len;

#ifdef CONFIG_IP_VS_IPV6

	if (af == AF_INET6)

		len = snprintf(&buf[*idx], buf_len - *idx, "[" NIP6_FMT "]",

			       NIP6(addr->in6)) + 1;

		len = snprintf(&buf[*idx], buf_len - *idx, "[%p6]",

			       &addr->in6) + 1;

	else

#endif

		len = snprintf(&buf[*idx], buf_len - *idx, NIPQUAD_FMT,

include/net/netfilter/nf_conntrack_tuple.h

+3 −3
Original line number Diff line number Diff line
@@ -122,10 +122,10 @@ static inline void nf_ct_dump_tuple_ip(const struct nf_conntrack_tuple *t) 
static inline void nf_ct_dump_tuple_ipv6(const struct nf_conntrack_tuple *t)

{

#ifdef DEBUG

	printk("tuple %p: %u " NIP6_FMT " %hu -> " NIP6_FMT " %hu\n",

	printk("tuple %p: %u %p6 %hu -> %p6 %hu\n",

	       t, t->dst.protonum,

	       NIP6(*(struct in6_addr *)t->src.u3.all), ntohs(t->src.u.all),

	       NIP6(*(struct in6_addr *)t->dst.u3.all), ntohs(t->dst.u.all));

	       t->src.u3.all, ntohs(t->src.u.all),

	       t->dst.u3.all, ntohs(t->dst.u.all));

#endif

}

include/net/sctp/sctp.h

+2 −2
Original line number Diff line number Diff line
@@ -285,9 +285,9 @@ extern int sctp_debug_flag; 
	if (sctp_debug_flag) { \

		if (saddr->sa.sa_family == AF_INET6) { \

			printk(KERN_DEBUG \

			       lead NIP6_FMT trail, \

			       lead "%p6" trail, \

			       leadparm, \

			       NIP6(saddr->v6.sin6_addr), \

			       &saddr->v6.sin6_addr, \

			       otherparms); \

		} else { \

			printk(KERN_DEBUG \

net/ipv4/tcp_input.c

+2 −2
Original line number Diff line number Diff line
@@ -2346,9 +2346,9 @@ static void DBGUNDO(struct sock *sk, const char *msg) 
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

	else if (sk->sk_family == AF_INET6) {

		struct ipv6_pinfo *np = inet6_sk(sk);

		printk(KERN_DEBUG "Undo %s " NIP6_FMT "/%u c%u l%u ss%u/%u p%u\n",

		printk(KERN_DEBUG "Undo %s %p6/%u c%u l%u ss%u/%u p%u\n",

		       msg,

		       NIP6(np->daddr), ntohs(inet->dport),

		       &np->daddr, ntohs(inet->dport),

		       tp->snd_cwnd, tcp_left_out(tp),

		       tp->snd_ssthresh, tp->prior_ssthresh,

		       tp->packets_out);