diff options
author | Joe Perches <joe@perches.com> | 2014-11-05 17:39:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-06 15:11:10 -0500 |
commit | cbffccc970394f82e397fccbeb136eeaffb3c552 (patch) | |
tree | de1fdbcb75ec938df78a49921531c694839ff080 /net/ipv6 | |
parent | f03ae5f9c8560f0a8dcad8ae6ea18efc981d8e35 (diff) |
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>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/ip6_output.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 8e950c250ada..916d2a166a9b 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
@@ -747,13 +747,11 @@ slow_path: | |||
747 | if (len < left) { | 747 | if (len < left) { |
748 | len &= ~7; | 748 | len &= ~7; |
749 | } | 749 | } |
750 | /* | ||
751 | * Allocate buffer. | ||
752 | */ | ||
753 | 750 | ||
754 | if ((frag = alloc_skb(len + hlen + sizeof(struct frag_hdr) + | 751 | /* Allocate buffer */ |
755 | hroom + troom, GFP_ATOMIC)) == NULL) { | 752 | frag = alloc_skb(len + hlen + sizeof(struct frag_hdr) + |
756 | NETDEBUG(KERN_INFO "IPv6: frag: no memory for new fragment!\n"); | 753 | hroom + troom, GFP_ATOMIC); |
754 | if (!frag) { | ||
757 | IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), | 755 | IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), |
758 | IPSTATS_MIB_FRAGFAILS); | 756 | IPSTATS_MIB_FRAGFAILS); |
759 | err = -ENOMEM; | 757 | err = -ENOMEM; |