net/sched: remove block pointer from common offload structure
Based on feedback from Jiri avoid carrying a pointer to the tcf_block structure in the tc_cls_common_offload structure. Instead store a flag in driver private data which indicates if offloads apply to a shared block at block binding time. Suggested-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com> Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com> Acked-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
2e7ae67b5f
commit
d6787147e1
@@ -71,8 +71,7 @@ static void mall_destroy_hw_filter(struct tcf_proto *tp,
|
||||
struct tc_cls_matchall_offload cls_mall = {};
|
||||
struct tcf_block *block = tp->chain->block;
|
||||
|
||||
tc_cls_common_offload_init(&cls_mall.common, tp, head->flags, block,
|
||||
extack);
|
||||
tc_cls_common_offload_init(&cls_mall.common, tp, head->flags, extack);
|
||||
cls_mall.command = TC_CLSMATCHALL_DESTROY;
|
||||
cls_mall.cookie = cookie;
|
||||
|
||||
@@ -94,8 +93,7 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,
|
||||
if (!cls_mall.rule)
|
||||
return -ENOMEM;
|
||||
|
||||
tc_cls_common_offload_init(&cls_mall.common, tp, head->flags, block,
|
||||
extack);
|
||||
tc_cls_common_offload_init(&cls_mall.common, tp, head->flags, extack);
|
||||
cls_mall.command = TC_CLSMATCHALL_REPLACE;
|
||||
cls_mall.cookie = cookie;
|
||||
|
||||
@@ -295,8 +293,7 @@ static int mall_reoffload(struct tcf_proto *tp, bool add, tc_setup_cb_t *cb,
|
||||
if (!cls_mall.rule)
|
||||
return -ENOMEM;
|
||||
|
||||
tc_cls_common_offload_init(&cls_mall.common, tp, head->flags, block,
|
||||
extack);
|
||||
tc_cls_common_offload_init(&cls_mall.common, tp, head->flags, extack);
|
||||
cls_mall.command = add ?
|
||||
TC_CLSMATCHALL_REPLACE : TC_CLSMATCHALL_DESTROY;
|
||||
cls_mall.cookie = (unsigned long)head;
|
||||
@@ -331,8 +328,7 @@ static void mall_stats_hw_filter(struct tcf_proto *tp,
|
||||
struct tc_cls_matchall_offload cls_mall = {};
|
||||
struct tcf_block *block = tp->chain->block;
|
||||
|
||||
tc_cls_common_offload_init(&cls_mall.common, tp, head->flags, block,
|
||||
NULL);
|
||||
tc_cls_common_offload_init(&cls_mall.common, tp, head->flags, NULL);
|
||||
cls_mall.command = TC_CLSMATCHALL_STATS;
|
||||
cls_mall.cookie = cookie;
|
||||
|
||||
|
Reference in New Issue
Block a user