net, misc: replace uses of NIP6_FMT with %p6 (fdb46ee7) · Commits · 戴 / test

net/netlabel/netlabel_addrlist.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -370,7 +370,7 @@ void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,

		if (dev != NULL)
		audit_log_format(audit_buf, " netif=%s", dev);
		audit_log_format(audit_buf, " %s=" NIP6_FMT, dir, NIP6(*addr));
		audit_log_format(audit_buf, " %s=%p6", dir, addr);
		if (ntohl(mask->s6_addr32[3]) != 0xffffffff) {
		u32 mask_len = 0;
		u32 mask_val;

net/sctp/ipv6.c

+14 −21

Original line number	Diff line number	Diff line
		@@ -223,10 +223,9 @@ static int sctp_v6_xmit(struct sk_buff skb, struct sctp_transport transport)
		ipv6_addr_copy(&fl.fl6_dst, rt0->addr);
		}

		SCTP_DEBUG_PRINTK("%s: skb:%p, len:%d, "
		"src:" NIP6_FMT " dst:" NIP6_FMT "\n",
		SCTP_DEBUG_PRINTK("%s: skb:%p, len:%d, src:%p6 dst:%p6\n",
		__func__, skb, skb->len,
		NIP6(fl.fl6_src), NIP6(fl.fl6_dst));
		&fl.fl6_src, &fl.fl6_dst);

		SCTP_INC_STATS(SCTP_MIB_OUTSCTPPACKS);

		@@ -252,23 +251,19 @@ static struct dst_entry sctp_v6_get_dst(struct sctp_association asoc,
		fl.oif = daddr->v6.sin6_scope_id;


		SCTP_DEBUG_PRINTK("%s: DST=" NIP6_FMT " ",
		__func__, NIP6(fl.fl6_dst));
		SCTP_DEBUG_PRINTK("%s: DST=%p6 ", __func__, &fl.fl6_dst);

		if (saddr) {
		ipv6_addr_copy(&fl.fl6_src, &saddr->v6.sin6_addr);
		SCTP_DEBUG_PRINTK(
		"SRC=" NIP6_FMT " - ",
		NIP6(fl.fl6_src));
		SCTP_DEBUG_PRINTK("SRC=%p6 - ", &fl.fl6_src);
		}

		dst = ip6_route_output(&init_net, NULL, &fl);
		if (!dst->error) {
		struct rt6_info *rt;
		rt = (struct rt6_info *)dst;
		SCTP_DEBUG_PRINTK(
		"rt6_dst:" NIP6_FMT " rt6_src:" NIP6_FMT "\n",
		NIP6(rt->rt6i_dst.addr), NIP6(rt->rt6i_src.addr));
		SCTP_DEBUG_PRINTK("rt6_dst:%p6 rt6_src:%p6\n",
		&rt->rt6i_dst.addr, &rt->rt6i_src.addr);
		return dst;
		}
		SCTP_DEBUG_PRINTK("NO ROUTE\n");
		@@ -314,9 +309,8 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk,
		__u8 matchlen = 0;
		__u8 bmatchlen;

		SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p "
		"daddr:" NIP6_FMT " ",
		__func__, asoc, dst, NIP6(daddr->v6.sin6_addr));
		SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p daddr:%p6 ",
		__func__, asoc, dst, &daddr->v6.sin6_addr);

		if (!asoc) {
		ipv6_dev_get_saddr(sock_net(sctp_opt2sk(sk)),
		@@ -324,8 +318,8 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk,
		&daddr->v6.sin6_addr,
		inet6_sk(&sk->inet.sk)->srcprefs,
		&saddr->v6.sin6_addr);
		SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: " NIP6_FMT "\n",
		NIP6(saddr->v6.sin6_addr));
		SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: %p6\n",
		&saddr->v6.sin6_addr);
		return;
		}

		@@ -353,12 +347,11 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk,

		if (baddr) {
		memcpy(saddr, baddr, sizeof(union sctp_addr));
		SCTP_DEBUG_PRINTK("saddr: " NIP6_FMT "\n",
		NIP6(saddr->v6.sin6_addr));
		SCTP_DEBUG_PRINTK("saddr: %p6\n", &saddr->v6.sin6_addr);
		} else {
		printk(KERN_ERR "%s: asoc:%p Could not find a valid source "
		"address for the dest:" NIP6_FMT "\n",
		__func__, asoc, NIP6(daddr->v6.sin6_addr));
		"address for the dest:%p6\n",
		__func__, asoc, &daddr->v6.sin6_addr);
		}

		rcu_read_unlock();
		@@ -727,7 +720,7 @@ static int sctp_v6_is_ce(const struct sk_buff *skb)
		/* Dump the v6 addr to the seq file. */
		static void sctp_v6_seq_dump_addr(struct seq_file seq, union sctp_addr addr)
		{
		seq_printf(seq, NIP6_FMT " ", NIP6(addr->v6.sin6_addr));
		seq_printf(seq, "%p6 ", &addr->v6.sin6_addr);
		}

		static void sctp_v6_ecn_capable(struct sock *sk)

net/sctp/sm_statefuns.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1123,11 +1123,10 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const struct sctp_endpoint *ep,
		if (from_addr.sa.sa_family == AF_INET6) {
		if (net_ratelimit())
		printk(KERN_WARNING
		"%s association %p could not find address "
		NIP6_FMT "\n",
		"%s association %p could not find address %p6\n",
		__func__,
		asoc,
		NIP6(from_addr.v6.sin6_addr));
		&from_addr.v6.sin6_addr);
		} else {
		if (net_ratelimit())
		printk(KERN_WARNING

net/sunrpc/clnt.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -278,8 +278,8 @@ struct rpc_clnt rpc_create(struct rpc_create_args args)
		case AF_INET6: {
		struct sockaddr_in6 *sin =
		(struct sockaddr_in6 *)args->address;
		snprintf(servername, sizeof(servername), NIP6_FMT,
		NIP6(sin->sin6_addr));
		snprintf(servername, sizeof(servername), "%p6",
		&sin->sin6_addr);
		break;
		}
		default:

net/sunrpc/rpcb_clnt.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -305,8 +305,8 @@ static int rpcb_register_netid6(struct sockaddr_in6 *address_to_register,
		snprintf(buf, sizeof(buf), "::.%u.%u",
		port >> 8, port & 0xff);
		else
		snprintf(buf, sizeof(buf), NIP6_FMT".%u.%u",
		NIP6(address_to_register->sin6_addr),
		snprintf(buf, sizeof(buf), "%p6.%u.%u",
		&address_to_register->sin6_addr,
		port >> 8, port & 0xff);
		map->r_addr = buf;

Admin message