Commit e4da9102 authored by wenxu's avatar wenxu Committed by David S. Miller
Browse files

cls_api: add flow_indr_block_call function



This patch make indr_block_call don't access struct tc_indr_block_cb
and tc_indr_block_dev directly

Signed-off-by: default avatarwenxu <wenxu@ucloud.cn>
Acked-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f8436988
Loading
Loading
Loading
Loading
+17 −10
Original line number Original line Diff line number Diff line
@@ -773,13 +773,27 @@ void tc_indr_block_cb_unregister(struct net_device *dev,
}
}
EXPORT_SYMBOL_GPL(tc_indr_block_cb_unregister);
EXPORT_SYMBOL_GPL(tc_indr_block_cb_unregister);


static void flow_indr_block_call(struct net_device *dev,
				 struct flow_block_offload *bo,
				 enum flow_block_command command)
{
	struct tc_indr_block_cb *indr_block_cb;
	struct tc_indr_block_dev *indr_dev;

	indr_dev = tc_indr_block_dev_lookup(dev);
	if (!indr_dev)
		return;

	list_for_each_entry(indr_block_cb, &indr_dev->cb_list, list)
		indr_block_cb->cb(dev, indr_block_cb->cb_priv, TC_SETUP_BLOCK,
				  bo);
}

static void tc_indr_block_call(struct tcf_block *block, struct net_device *dev,
static void tc_indr_block_call(struct tcf_block *block, struct net_device *dev,
			       struct tcf_block_ext_info *ei,
			       struct tcf_block_ext_info *ei,
			       enum flow_block_command command,
			       enum flow_block_command command,
			       struct netlink_ext_ack *extack)
			       struct netlink_ext_ack *extack)
{
{
	struct tc_indr_block_cb *indr_block_cb;
	struct tc_indr_block_dev *indr_dev;
	struct flow_block_offload bo = {
	struct flow_block_offload bo = {
		.command	= command,
		.command	= command,
		.binder_type	= ei->binder_type,
		.binder_type	= ei->binder_type,
@@ -790,14 +804,7 @@ static void tc_indr_block_call(struct tcf_block *block, struct net_device *dev,
	};
	};
	INIT_LIST_HEAD(&bo.cb_list);
	INIT_LIST_HEAD(&bo.cb_list);


	indr_dev = tc_indr_block_dev_lookup(dev);
	flow_indr_block_call(dev, &bo, command);
	if (!indr_dev)
		return;

	list_for_each_entry(indr_block_cb, &indr_dev->cb_list, list)
		indr_block_cb->cb(dev, indr_block_cb->cb_priv, TC_SETUP_BLOCK,
				  &bo);

	tcf_block_setup(block, &bo);
	tcf_block_setup(block, &bo);
}
}