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>

diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index 08815fe9314d050d7c617faf48ef3995a9f33f80..85cee929b9ceeb304501b8288b3d3ed597013dcb 100644 (file)
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -748,7 +748,6 @@ struct tc_cls_bpf_offload {
        struct bpf_prog *oldprog;
        const char *name;
        bool exts_integrated;
-       u32 gen_flags;
 };
 
 struct tc_mqprio_qopt_offload {

diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index 0bffb189d64611cc1703c920ea0076e61925466a..b8f953d00c4634b157f4222f2fce5cd061690a5d 100644 (file)
--- 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,
        cls_bpf.oldprog = oldprog ? oldprog->filter : NULL;
        cls_bpf.name = obj->bpf_name;
        cls_bpf.exts_integrated = obj->exts_integrated;
-       cls_bpf.gen_flags = obj->gen_flags;
 
        if (oldprog)
                tcf_block_offload_dec(block, &oldprog->gen_flags);
@@ -233,7 +232,6 @@ static void cls_bpf_offload_update_stats(struct tcf_proto *tp,
        cls_bpf.prog = prog->filter;
        cls_bpf.name = prog->bpf_name;
        cls_bpf.exts_integrated = prog->exts_integrated;
-       cls_bpf.gen_flags = prog->gen_flags;
 
        tc_setup_cb_call(block, NULL, TC_SETUP_CLSBPF, &cls_bpf, false);
 }