diff options
| author | David S. Miller <davem@davemloft.net> | 2020-03-12 12:34:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-12 12:34:23 -0700 |
| commit | bf3347c4d15e26ab17fce3aa4041345198f4280c (patch) | |
| tree | e7dca5ea4e7bdb3e5892ab64e0f335f1219595f1 /net/core/dev.c | |
| parent | 93e616131a3825189570524d4792b5223bf1d68c (diff) | |
| parent | b8ce90370977dbe24d2ed7271b65710ec9c40166 (diff) | |
| download | linux-bf3347c4d15e26ab17fce3aa4041345198f4280c.tar.gz linux-bf3347c4d15e26ab17fce3aa4041345198f4280c.tar.bz2 linux-bf3347c4d15e26ab17fce3aa4041345198f4280c.zip | |
Merge branch 'ct-offload' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 25dab1598803..d84541c24446 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4848,7 +4848,8 @@ sch_handle_ingress(struct sk_buff *skb, struct packet_type **pt_prev, int *ret, skb->tc_at_ingress = 1; mini_qdisc_bstats_cpu_update(miniq, skb); - switch (tcf_classify(skb, miniq->filter_list, &cl_res, false)) { + switch (tcf_classify_ingress(skb, miniq->block, miniq->filter_list, + &cl_res, false)) { case TC_ACT_OK: case TC_ACT_RECLASSIFY: skb->tc_index = TC_H_MIN(cl_res.classid); |