diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2023-11-16 16:05:44 +0100 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-11-16 16:05:44 +0100 |
| commit | 56eddc3cb1affe014d567f8460e5a76ca079f842 (patch) | |
| tree | 7363e0f189ac7276fcb1bd2660f8478a45fd00d6 /net/sched | |
| parent | 3185d57cfcd34fadbe28f4ed57a6cb5122277ece (diff) | |
| parent | 7475e51b87969e01a6812eac713a1c8310372e8a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/act_ct.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c index 0db0ecf1d110..b3f4a503ee2b 100644 --- a/net/sched/act_ct.c +++ b/net/sched/act_ct.c @@ -1549,6 +1549,9 @@ static int tcf_ct_offload_act_setup(struct tc_action *act, void *entry_data, if (bind) { struct flow_action_entry *entry = entry_data; + if (tcf_ct_helper(act)) + return -EOPNOTSUPP; + entry->id = FLOW_ACTION_CT; entry->ct.action = tcf_ct_action(act); entry->ct.zone = tcf_ct_zone(act); |