OSDN Git Service

cls_flower: pass offload flags to tc_cls_common_offload_init()
authorJakub Kicinski <jakub.kicinski@netronome.com>
Wed, 24 Jan 2018 20:54:20 +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_flower.c

index 3f2654c..79aa504 100644 (file)
@@ -223,7 +223,7 @@ static void fl_hw_destroy_filter(struct tcf_proto *tp, struct cls_fl_filter *f)
        struct tc_cls_flower_offload cls_flower = {};
        struct tcf_block *block = tp->chain->block;
 
-       tc_cls_common_offload_init_deprecated(&cls_flower.common, tp, NULL);
+       tc_cls_common_offload_init(&cls_flower.common, tp, f->flags, NULL);
        cls_flower.command = TC_CLSFLOWER_DESTROY;
        cls_flower.cookie = (unsigned long) f;
 
@@ -243,7 +243,7 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
        bool skip_sw = tc_skip_sw(f->flags);
        int err;
 
-       tc_cls_common_offload_init_deprecated(&cls_flower.common, tp, extack);
+       tc_cls_common_offload_init(&cls_flower.common, tp, f->flags, extack);
        cls_flower.command = TC_CLSFLOWER_REPLACE;
        cls_flower.cookie = (unsigned long) f;
        cls_flower.dissector = dissector;
@@ -272,7 +272,7 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f)
        struct tc_cls_flower_offload cls_flower = {};
        struct tcf_block *block = tp->chain->block;
 
-       tc_cls_common_offload_init_deprecated(&cls_flower.common, tp, NULL);
+       tc_cls_common_offload_init(&cls_flower.common, tp, f->flags, NULL);
        cls_flower.command = TC_CLSFLOWER_STATS;
        cls_flower.cookie = (unsigned long) f;
        cls_flower.exts = &f->exts;