Commit a7d632b6 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[IPV4]: Use NIPQUAD_FMT to format ipv4 addresses. 



And use %u to format port.

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 334f8b2a

net/ipv4/af_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -1077,7 +1077,7 @@ static int inet_sk_reselect_saddr(struct sock *sk) 


	if (sysctl_ip_dynaddr > 1) {

		printk(KERN_INFO "%s(): shifting inet->"

				 "saddr from %d.%d.%d.%d to %d.%d.%d.%d\n",

				 "saddr from " NIPQUAD_FMT " to " NIPQUAD_FMT "\n",

		       __func__,

		       NIPQUAD(old_saddr),

		       NIPQUAD(new_saddr));

net/ipv4/arp.c

+2 −2
Original line number Diff line number Diff line
@@ -1310,7 +1310,7 @@ static void arp_format_neigh_entry(struct seq_file *seq, 
#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)

	}

#endif

	sprintf(tbuf, "%u.%u.%u.%u", NIPQUAD(*(u32*)n->primary_key));

	sprintf(tbuf, NIPQUAD_FMT, NIPQUAD(*(u32*)n->primary_key));

	seq_printf(seq, "%-16s 0x%-10x0x%-10x%s     *        %s\n",

		   tbuf, hatype, arp_state_to_flags(n), hbuffer, dev->name);

	read_unlock(&n->lock);
@@ -1323,7 +1323,7 @@ static void arp_format_pneigh_entry(struct seq_file *seq, 
	int hatype = dev ? dev->type : 0;

	char tbuf[16];



	sprintf(tbuf, "%u.%u.%u.%u", NIPQUAD(*(u32*)n->key));

	sprintf(tbuf, NIPQUAD_FMT, NIPQUAD(*(u32*)n->key));

	seq_printf(seq, "%-16s 0x%-10x0x%-10x%s     *        %s\n",

		   tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00",

		   dev ? dev->name : "*");

net/ipv4/fib_trie.c

+2 −2
Original line number Diff line number Diff line
@@ -2424,7 +2424,7 @@ static int fib_trie_seq_show(struct seq_file *seq, void *v) 
		__be32 prf = htonl(mask_pfx(tn->key, tn->pos));



		seq_indent(seq, iter->depth-1);

		seq_printf(seq, "  +-- %d.%d.%d.%d/%d %d %d %d\n",

		seq_printf(seq, "  +-- " NIPQUAD_FMT "/%d %d %d %d\n",

			   NIPQUAD(prf), tn->pos, tn->bits, tn->full_children,

			   tn->empty_children);
@@ -2435,7 +2435,7 @@ static int fib_trie_seq_show(struct seq_file *seq, void *v) 
		__be32 val = htonl(l->key);



		seq_indent(seq, iter->depth);

		seq_printf(seq, "  |-- %d.%d.%d.%d\n", NIPQUAD(val));

		seq_printf(seq, "  |-- " NIPQUAD_FMT "\n", NIPQUAD(val));



		hlist_for_each_entry_rcu(li, node, &l->list, hlist) {

			struct fib_alias *fa;

net/ipv4/icmp.c

+6 −6
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ static void icmp_unreach(struct sk_buff *skb) 
			break;

		case ICMP_FRAG_NEEDED:

			if (ipv4_config.no_pmtu_disc) {

				LIMIT_NETDEBUG(KERN_INFO "ICMP: %u.%u.%u.%u: "

				LIMIT_NETDEBUG(KERN_INFO "ICMP: " NIPQUAD_FMT ": "

							 "fragmentation needed "

							 "and DF set.\n",

					       NIPQUAD(iph->daddr));
@@ -697,7 +697,7 @@ static void icmp_unreach(struct sk_buff *skb) 
			}

			break;

		case ICMP_SR_FAILED:

			LIMIT_NETDEBUG(KERN_INFO "ICMP: %u.%u.%u.%u: Source "

			LIMIT_NETDEBUG(KERN_INFO "ICMP: " NIPQUAD_FMT ": Source "

						 "Route Failed.\n",

				       NIPQUAD(iph->daddr));

			break;
@@ -730,9 +730,9 @@ static void icmp_unreach(struct sk_buff *skb) 
	if (!net->ipv4.sysctl_icmp_ignore_bogus_error_responses &&

	    inet_addr_type(net, iph->daddr) == RTN_BROADCAST) {

		if (net_ratelimit())

			printk(KERN_WARNING "%u.%u.%u.%u sent an invalid ICMP "

			printk(KERN_WARNING NIPQUAD_FMT " sent an invalid ICMP "

					    "type %u, code %u "

					    "error to a broadcast: %u.%u.%u.%u on %s\n",

					    "error to a broadcast: " NIPQUAD_FMT " on %s\n",

			       NIPQUAD(ip_hdr(skb)->saddr),

			       icmph->type, icmph->code,

			       NIPQUAD(iph->daddr),
@@ -953,8 +953,8 @@ static void icmp_address_reply(struct sk_buff *skb) 
				break;

		}

		if (!ifa && net_ratelimit()) {

			printk(KERN_INFO "Wrong address mask %u.%u.%u.%u from "

					 "%s/%u.%u.%u.%u\n",

			printk(KERN_INFO "Wrong address mask " NIPQUAD_FMT " from "

					 "%s/" NIPQUAD_FMT "\n",

			       NIPQUAD(*mp), dev->name, NIPQUAD(rt->rt_src));

		}

	}

net/ipv4/ip_fragment.c

+1 −1
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev, 
out_oversize:

	if (net_ratelimit())

		printk(KERN_INFO

			"Oversized IP packet from %d.%d.%d.%d.\n",

			"Oversized IP packet from " NIPQUAD_FMT ".\n",

			NIPQUAD(qp->saddr));

out_fail:

	IP_INC_STATS_BH(IPSTATS_MIB_REASMFAILS);