OSDN Git Service

cls_bpf: pass offload flags to tc_cls_common_offload_init()
authorJakub Kicinski <jakub.kicinski@netronome.com>
Wed, 24 Jan 2018 20:54:16 +0000 (12:54 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 24 Jan 2018 21:01:10 +0000 (16:01 -0500)
Pass offload flags to the new implementation of
tc_cls_common_offload_init().  Extack will now only
be set if user requested skip_sw.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/cls_bpf.c

index b8f953d..323b01f 100644 (file)
@@ -159,7 +159,8 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct cls_bpf_prog *prog,
        skip_sw = prog && tc_skip_sw(prog->gen_flags);
        obj = prog ?: oldprog;
 
-       tc_cls_common_offload_init_deprecated(&cls_bpf.common, tp, extack);
+       tc_cls_common_offload_init(&cls_bpf.common, tp, obj->gen_flags,
+                                  extack);
        cls_bpf.command = TC_CLSBPF_OFFLOAD;
        cls_bpf.exts = &obj->exts;
        cls_bpf.prog = prog ? prog->filter : NULL;
@@ -226,7 +227,7 @@ static void cls_bpf_offload_update_stats(struct tcf_proto *tp,
        struct tcf_block *block = tp->chain->block;
        struct tc_cls_bpf_offload cls_bpf = {};
 
-       tc_cls_common_offload_init_deprecated(&cls_bpf.common, tp, NULL);
+       tc_cls_common_offload_init(&cls_bpf.common, tp, prog->gen_flags, NULL);
        cls_bpf.command = TC_CLSBPF_STATS;
        cls_bpf.exts = &prog->exts;
        cls_bpf.prog = prog->filter;