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

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

cls_matchall: propagate extack to delete callback 



Propagate extack on removal of offloaded filter.  Don't pass
extack from error paths.

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 93da52b5

net/sched/cls_matchall.c

+5 −4
Original line number Diff line number Diff line
@@ -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);