Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f558fdea authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

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: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 34832e1c

include/net/pkt_cls.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -748,7 +748,6 @@ struct tc_cls_bpf_offload { 
	struct bpf_prog *oldprog;

	struct bpf_prog *oldprog;

	const char *name;

	const char *name;

	bool exts_integrated;

	bool exts_integrated;

	u32 gen_flags;

};

};





struct tc_mqprio_qopt_offload {

struct tc_mqprio_qopt_offload {

net/sched/cls_bpf.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -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.oldprog = oldprog ? oldprog->filter : NULL;

	cls_bpf.name = obj->bpf_name;

	cls_bpf.name = obj->bpf_name;

	cls_bpf.exts_integrated = obj->exts_integrated;

	cls_bpf.exts_integrated = obj->exts_integrated;

	cls_bpf.gen_flags = obj->gen_flags;





	if (oldprog)

	if (oldprog)

		tcf_block_offload_dec(block, &oldprog->gen_flags);

		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.prog = prog->filter;

	cls_bpf.name = prog->bpf_name;

	cls_bpf.name = prog->bpf_name;

	cls_bpf.exts_integrated = prog->exts_integrated;

	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);

	tc_setup_cb_call(block, NULL, TC_SETUP_CLSBPF, &cls_bpf, false);

}

}