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

Commit ca933452 authored by Heikki Orsila's avatar Heikki Orsila Committed by David S. Miller
Browse files

[IPV4]: Debug cleanup 



Here's a small patch to cleanup NETDEBUG() use in net/ipv4/ for Linux 
kernel 2.6.13-rc5. Also weird use of indentation is changed in some
places.

Signed-off-by: default avatarHeikki Orsila <heikki.orsila@iki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d479e40

net/ipv4/icmp.c

+1 −2
Original line number Diff line number Diff line
@@ -936,8 +936,7 @@ int icmp_rcv(struct sk_buff *skb) 
	case CHECKSUM_HW:

		if (!(u16)csum_fold(skb->csum))

			break;

		NETDEBUG(if (net_ratelimit())

				printk(KERN_DEBUG "icmp v4 hw csum failure\n"));

		LIMIT_NETDEBUG(printk(KERN_DEBUG "icmp v4 hw csum failure\n"));

	case CHECKSUM_NONE:

		if ((u16)csum_fold(skb_checksum(skb, 0, skb->len, 0)))

			goto error;

net/ipv4/ip_fragment.c

+3 −5
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static struct ipq *ip_frag_create(unsigned hash, struct iphdr *iph, u32 user) 
	return ip_frag_intern(hash, qp);



out_nomem:

	NETDEBUG(if (net_ratelimit()) printk(KERN_ERR "ip_frag_create: no memory left !\n"));

	LIMIT_NETDEBUG(printk(KERN_ERR "ip_frag_create: no memory left !\n"));

	return NULL;

}
@@ -625,10 +625,8 @@ static struct sk_buff *ip_frag_reasm(struct ipq *qp, struct net_device *dev) 
	return head;



out_nomem:

 	NETDEBUG(if (net_ratelimit())

	         printk(KERN_ERR 

			"IP: queue_glue: no memory for gluing queue %p\n",

			qp));

 	LIMIT_NETDEBUG(printk(KERN_ERR "IP: queue_glue: no memory for gluing "

			      "queue %p\n", qp));

	goto out_fail;

out_oversize:

	if (net_ratelimit())

net/ipv4/tcp_ipv4.c

+6 −8
Original line number Diff line number Diff line
@@ -1494,10 +1494,9 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
			 * to destinations, already remembered

			 * to the moment of synflood.

			 */

			NETDEBUG(if (net_ratelimit()) \

					printk(KERN_DEBUG "TCP: drop open "

			LIMIT_NETDEBUG(printk(KERN_DEBUG "TCP: drop open "

					      "request from %u.%u."

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

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

					      NIPQUAD(saddr),

					      ntohs(skb->h.th->source)));

			dst_release(dst);
@@ -1627,8 +1626,7 @@ static int tcp_v4_checksum_init(struct sk_buff *skb) 
				  skb->nh.iph->daddr, skb->csum))

			return 0;



		NETDEBUG(if (net_ratelimit())

				printk(KERN_DEBUG "hw tcp v4 csum failed\n"));

		LIMIT_NETDEBUG(printk(KERN_DEBUG "hw tcp v4 csum failed\n"));

		skb->ip_summed = CHECKSUM_NONE;

	}

	if (skb->len <= 76) {

net/ipv4/udp.c

+16 −18
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ back_from_confirm: 
		/* ... which is an evident application bug. --ANK */

		release_sock(sk);



		NETDEBUG(if (net_ratelimit()) printk(KERN_DEBUG "udp cork app bug 2\n"));

		LIMIT_NETDEBUG(printk(KERN_DEBUG "udp cork app bug 2\n"));

		err = -EINVAL;

		goto out;

	}
@@ -693,7 +693,7 @@ static int udp_sendpage(struct sock *sk, struct page *page, int offset, 
	if (unlikely(!up->pending)) {

		release_sock(sk);



		NETDEBUG(if (net_ratelimit()) printk(KERN_DEBUG "udp cork app bug 3\n"));

		LIMIT_NETDEBUG(printk(KERN_DEBUG "udp cork app bug 3\n"));

		return -EINVAL;

	}
@@ -1102,7 +1102,7 @@ static int udp_checksum_init(struct sk_buff *skb, struct udphdr *uh, 
		skb->ip_summed = CHECKSUM_UNNECESSARY;

		if (!udp_check(uh, ulen, saddr, daddr, skb->csum))

			return 0;

		NETDEBUG(if (net_ratelimit()) printk(KERN_DEBUG "udp v4 hw csum failure.\n"));

		LIMIT_NETDEBUG(printk(KERN_DEBUG "udp v4 hw csum failure.\n"));

		skb->ip_summed = CHECKSUM_NONE;

	}

	if (skb->ip_summed != CHECKSUM_UNNECESSARY)
@@ -1181,8 +1181,7 @@ int udp_rcv(struct sk_buff *skb) 
	return(0);



short_packet:

	NETDEBUG(if (net_ratelimit())

		printk(KERN_DEBUG "UDP: short packet: From %u.%u.%u.%u:%u %d/%d to %u.%u.%u.%u:%u\n",

	LIMIT_NETDEBUG(printk(KERN_DEBUG "UDP: short packet: From %u.%u.%u.%u:%u %d/%d to %u.%u.%u.%u:%u\n",

			      NIPQUAD(saddr),

			      ntohs(uh->source),

			      ulen,
@@ -1199,8 +1198,7 @@ csum_error: 
	 * RFC1122: OK.  Discards the bad packet silently (as far as 

	 * the network is concerned, anyway) as per 4.1.3.4 (MUST). 

	 */

	NETDEBUG(if (net_ratelimit())

		 printk(KERN_DEBUG "UDP: bad checksum. From %d.%d.%d.%d:%d to %d.%d.%d.%d:%d ulen %d\n",

	LIMIT_NETDEBUG(printk(KERN_DEBUG "UDP: bad checksum. From %d.%d.%d.%d:%d to %d.%d.%d.%d:%d ulen %d\n",

			      NIPQUAD(saddr),

			      ntohs(uh->source),

			      NIPQUAD(daddr),