diff options
author | Joe Perches <joe@perches.com> | 2014-11-05 14:39:21 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-06 15:11:10 -0500 |
commit | cbffccc970394f82e397fccbeb136eeaffb3c552 (patch) | |
tree | de1fdbcb75ec938df78a49921531c694839ff080 /net/ipv4/ip_output.c | |
parent | f03ae5f9c8560f0a8dcad8ae6ea18efc981d8e35 (diff) | |
download | op-kernel-dev-cbffccc970394f82e397fccbeb136eeaffb3c552.zip op-kernel-dev-cbffccc970394f82e397fccbeb136eeaffb3c552.tar.gz |
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/ipv4/ip_output.c')
-rw-r--r-- | net/ipv4/ip_output.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index bc6471d..4a929ad 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -662,12 +662,10 @@ slow_path: 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; } |