diff options
| author | David S. Miller <davem@davemloft.net> | 2020-10-05 17:33:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-10-05 18:40:01 -0700 |
| commit | 8b0308fe319b8002753ea66f8f940fb393792ddd (patch) | |
| tree | 4c5a80346308db8cac9ff0951bb10e892c2387ad /net/sched/act_ct.c | |
| parent | f4f9dcc3f4c5f576ee195bdf0fd1682da7a3a73a (diff) | |
| parent | 7575fdda569b2a2e8be32c1a64ecb05d6f96a500 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Rejecting non-native endian BTF overlapped with the addition
of support for it.
The rest were more simple overlapping changes, except the
renesas ravb binding update, which had to follow a file
move as well as a YAML conversion.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_ct.c')
| -rw-r--r-- | net/sched/act_ct.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c index 47f9128ecb8f..9c79fb92c2da 100644 --- a/net/sched/act_ct.c +++ b/net/sched/act_ct.c @@ -1295,8 +1295,6 @@ static int tcf_ct_init(struct net *net, struct nlattr *nla, tcf_chain_put_by_act(goto_ch); if (params) call_rcu(¶ms->rcu, tcf_ct_params_free); - if (res == ACT_P_CREATED) - tcf_idr_insert(tn, *a); return res; |