cls_matchall: propagate extack to delete callback
Propagate extack on removal of offloaded filter. Don't pass extack from error paths. 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>
This commit is contained in:
parent
93da52b567
commit
b505b29f68
|
@ -71,12 +71,13 @@ static void mall_destroy_rcu(struct rcu_head *rcu)
|
|||
|
||||
static void mall_destroy_hw_filter(struct tcf_proto *tp,
|
||||
struct cls_mall_head *head,
|
||||
unsigned long cookie)
|
||||
unsigned long cookie,
|
||||
struct netlink_ext_ack *extack)
|
||||
{
|
||||
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, NULL);
|
||||
tc_cls_common_offload_init(&cls_mall.common, tp, head->flags, extack);
|
||||
cls_mall.command = TC_CLSMATCHALL_DESTROY;
|
||||
cls_mall.cookie = cookie;
|
||||
|
||||
|
@ -102,7 +103,7 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,
|
|||
err = tc_setup_cb_call(block, NULL, TC_SETUP_CLSMATCHALL,
|
||||
&cls_mall, skip_sw);
|
||||
if (err < 0) {
|
||||
mall_destroy_hw_filter(tp, head, cookie);
|
||||
mall_destroy_hw_filter(tp, head, cookie, NULL);
|
||||
return err;
|
||||
} else if (err > 0) {
|
||||
tcf_block_offload_inc(block, &head->flags);
|
||||
|
@ -122,7 +123,7 @@ static void mall_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack)
|
|||
return;
|
||||
|
||||
if (!tc_skip_hw(head->flags))
|
||||
mall_destroy_hw_filter(tp, head, (unsigned long) head);
|
||||
mall_destroy_hw_filter(tp, head, (unsigned long) head, extack);
|
||||
|
||||
if (tcf_exts_get_net(&head->exts))
|
||||
call_rcu(&head->rcu, mall_destroy_rcu);
|
||||
|
|
Loading…
Reference in a new issue