diff options
author | David S. Miller <davem@davemloft.net> | 2020-08-23 20:48:27 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-08-23 20:48:27 +0200 |
commit | 7611cbb900b4b9a6fe5eca12fb12645c0576a015 (patch) | |
tree | 9c8c8e1fa991e4728d25a19b86c974c8e49ee1b7 /net/sched | |
parent | Merge branch 'l2tp-replace-custom-logging-code-with-tracepoints' (diff) | |
parent | Merge tag 'powerpc-5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff) | |
download | linux-7611cbb900b4b9a6fe5eca12fb12645c0576a015.tar.xz linux-7611cbb900b4b9a6fe5eca12fb12645c0576a015.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/act_ct.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c index db25a0dc0f57..47f9128ecb8f 100644 --- a/net/sched/act_ct.c +++ b/net/sched/act_ct.c @@ -704,7 +704,7 @@ static int tcf_ct_handle_fragments(struct net *net, struct sk_buff *skb, err = ip_defrag(net, skb, user); local_bh_enable(); if (err && err != -EINPROGRESS) - goto out_free; + return err; if (!err) { *defrag = true; |