diff options
| author |   Joe Perches <joe@perches.com> | 2018-03-12 08:07:12 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-15 14:28:03 -0400 |
| commit | 0c3d5a96d5e5e6d5662d335a3bdfb76f35433f18 (patch) | |
| tree | c846443806fa4f887ca492d211ef04ca0aa21902 /net/netfilter/nfnetlink_queue.c | |
| parent | Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue (diff) | |
| download | linux-dev-0c3d5a96d5e5e6d5662d335a3bdfb76f35433f18.tar.xz linux-dev-0c3d5a96d5e5e6d5662d335a3bdfb76f35433f18.zip | |
net: drivers/net: Remove unnecessary skb_copy_expand OOM messages
skb_copy_expand without __GFP_NOWARN already does a dump_stack
on OOM so these messages are redundant.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/netfilter/nfnetlink_queue.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index 59e2833c17f1..9f572ed56208 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -833,11 +833,8 @@ nfqnl_mangle(void *data, int data_len, struct nf_queue_entry *e, int diff) if (diff > skb_tailroom(e->skb)) { nskb = skb_copy_expand(e->skb, skb_headroom(e->skb), diff, GFP_ATOMIC); - if (!nskb) { - printk(KERN_WARNING "nf_queue: OOM " - "in mangle, dropping packet\n"); + if (!nskb) return -ENOMEM; - } kfree_skb(e->skb); e->skb = nskb; } |