diff options
author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2018-01-24 15:54:15 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-01-24 16:01:10 -0500 |
commit | f558fdea03bf70f23a3ac63d8c7cdd9755797f80 (patch) | |
tree | 424317af2229c78ba040808a8f71eb7404b2401c | |
parent | 34832e1c701553ed3eeefe5413fa93d185cff7f4 (diff) |
cls_bpf: remove gen_flags from bpf_offload
cls_bpf now guarantees that only device-bound programs are
allowed with skip_sw. The drivers no longer pay attention to
flags on filter load, therefore the bpf_offload member can be
removed. If flags are needed again they should probably be
added to struct tc_cls_common_offload instead.
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>
-rw-r--r-- | include/net/pkt_cls.h | 1 | ||||
-rw-r--r-- | net/sched/cls_bpf.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index 08815fe9314d..85cee929b9ce 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h | |||
@@ -748,7 +748,6 @@ struct tc_cls_bpf_offload { | |||
748 | struct bpf_prog *oldprog; | 748 | struct bpf_prog *oldprog; |
749 | const char *name; | 749 | const char *name; |
750 | bool exts_integrated; | 750 | bool exts_integrated; |
751 | u32 gen_flags; | ||
752 | }; | 751 | }; |
753 | 752 | ||
754 | struct tc_mqprio_qopt_offload { | 753 | struct tc_mqprio_qopt_offload { |
diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c index 0bffb189d646..b8f953d00c46 100644 --- a/net/sched/cls_bpf.c +++ b/net/sched/cls_bpf.c | |||
@@ -166,7 +166,6 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct cls_bpf_prog *prog, | |||
166 | cls_bpf.oldprog = oldprog ? oldprog->filter : NULL; | 166 | cls_bpf.oldprog = oldprog ? oldprog->filter : NULL; |
167 | cls_bpf.name = obj->bpf_name; | 167 | cls_bpf.name = obj->bpf_name; |
168 | cls_bpf.exts_integrated = obj->exts_integrated; | 168 | cls_bpf.exts_integrated = obj->exts_integrated; |
169 | cls_bpf.gen_flags = obj->gen_flags; | ||
170 | 169 | ||
171 | if (oldprog) | 170 | if (oldprog) |
172 | tcf_block_offload_dec(block, &oldprog->gen_flags); | 171 | tcf_block_offload_dec(block, &oldprog->gen_flags); |
@@ -233,7 +232,6 @@ static void cls_bpf_offload_update_stats(struct tcf_proto *tp, | |||
233 | cls_bpf.prog = prog->filter; | 232 | cls_bpf.prog = prog->filter; |
234 | cls_bpf.name = prog->bpf_name; | 233 | cls_bpf.name = prog->bpf_name; |
235 | cls_bpf.exts_integrated = prog->exts_integrated; | 234 | cls_bpf.exts_integrated = prog->exts_integrated; |
236 | cls_bpf.gen_flags = prog->gen_flags; | ||
237 | 235 | ||
238 | tc_setup_cb_call(block, NULL, TC_SETUP_CLSBPF, &cls_bpf, false); | 236 | tc_setup_cb_call(block, NULL, TC_SETUP_CLSBPF, &cls_bpf, false); |
239 | } | 237 | } |