Commit cbffccc9 authored Nov 05, 2014 by Joe Perches Committed by David S. Miller Nov 06, 2014

net; ipv[46] - Remove 2 unnecessary NETDEBUG OOM messages



These messages aren't useful as there's a generic dump_stack()
on OOM.

Neaten the comment and if test above the OOM by separating the
assign in if into an allocation then if test.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f03ae5f9

net/ipv4/ip_output.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -662,12 +662,10 @@ int ip_fragment(struct sk_buff skb, int (output)(struct sk_buff *))
		if (len < left) {
		len &= ~7;
		}
		/*
		* Allocate buffer.
		*/

		if ((skb2 = alloc_skb(len+hlen+ll_rs, GFP_ATOMIC)) == NULL) {
		NETDEBUG(KERN_INFO "IP: frag: no memory for new fragment!\n");
		/* Allocate buffer */
		skb2 = alloc_skb(len + hlen + ll_rs, GFP_ATOMIC);
		if (!skb2) {
		err = -ENOMEM;
		goto fail;
		}

net/ipv6/ip6_output.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -747,13 +747,11 @@ int ip6_fragment(struct sk_buff skb, int (output)(struct sk_buff *))
		if (len < left) {
		len &= ~7;
		}
		/*
		* Allocate buffer.
		*/

		if ((frag = alloc_skb(len + hlen + sizeof(struct frag_hdr) +
		hroom + troom, GFP_ATOMIC)) == NULL) {
		NETDEBUG(KERN_INFO "IPv6: frag: no memory for new fragment!\n");
		/* Allocate buffer */
		frag = alloc_skb(len + hlen + sizeof(struct frag_hdr) +
		hroom + troom, GFP_ATOMIC);
		if (!frag) {
		IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
		IPSTATS_MIB_FRAGFAILS);
		err = -ENOMEM;