Commit c5f6d490 authored by Ioana Ciornei's avatar Ioana Ciornei Committed by David S. Miller
Browse files

dpaa2-switch: reorganize dpaa2_switch_cls_flower_replace 



Extract the necessary steps to offload a filter by using the ACL table
in a separate function - dpaa2_switch_cls_flower_replace_acl().
This is intended to help with the code readability when the mirroring
support is added.

Signed-off-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent adcb7aa3

drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c

+26 −6
Original line number Diff line number Diff line
@@ -376,7 +376,8 @@ static int dpaa2_switch_tc_parse_action_acl(struct ethsw_core *ethsw, 
	return err;

}



int dpaa2_switch_cls_flower_replace(struct dpaa2_switch_filter_block *block,

static int

dpaa2_switch_cls_flower_replace_acl(struct dpaa2_switch_filter_block *block,

				    struct flow_cls_offload *cls)

{

	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);
@@ -386,11 +387,6 @@ int dpaa2_switch_cls_flower_replace(struct dpaa2_switch_filter_block *block, 
	struct flow_action_entry *act;

	int err;



	if (!flow_offload_has_one_action(&rule->action)) {

		NL_SET_ERR_MSG(extack, "Only singular actions are supported");

		return -EOPNOTSUPP;

	}



	if (dpaa2_switch_acl_tbl_is_full(block)) {

		NL_SET_ERR_MSG(extack, "Maximum filter capacity reached");

		return -ENOMEM;
@@ -425,6 +421,30 @@ int dpaa2_switch_cls_flower_replace(struct dpaa2_switch_filter_block *block, 
	return err;

}



int dpaa2_switch_cls_flower_replace(struct dpaa2_switch_filter_block *block,

				    struct flow_cls_offload *cls)

{

	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);

	struct netlink_ext_ack *extack = cls->common.extack;

	struct flow_action_entry *act;



	if (!flow_offload_has_one_action(&rule->action)) {

		NL_SET_ERR_MSG(extack, "Only singular actions are supported");

		return -EOPNOTSUPP;

	}



	act = &rule->action.entries[0];

	switch (act->id) {

	case FLOW_ACTION_REDIRECT:

	case FLOW_ACTION_TRAP:

	case FLOW_ACTION_DROP:

		return dpaa2_switch_cls_flower_replace_acl(block, cls);

	default:

		NL_SET_ERR_MSG_MOD(extack, "Action not supported");

		return -EOPNOTSUPP;

	}

}



int dpaa2_switch_cls_flower_destroy(struct dpaa2_switch_filter_block *block,

				    struct flow_cls_offload *cls)

{