dpaa2-switch: reorganize dpaa2_switch_cls_matchall_replace

Extract the necessary steps to offload a filter by using the ACL table
in a separate function - dpaa2_switch_cls_matchall_replace_acl().

This is intended to help with the code readability when the mirroring
support is added.

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
index 38a321b..6372910 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
@@ -457,7 +457,8 @@ int dpaa2_switch_cls_flower_destroy(struct dpaa2_switch_filter_block *block,
        return dpaa2_switch_acl_tbl_remove_entry(block, entry);
 }
 
-int dpaa2_switch_cls_matchall_replace(struct dpaa2_switch_filter_block *block,
+static int
+dpaa2_switch_cls_matchall_replace_acl(struct dpaa2_switch_filter_block *block,
                                      struct tc_cls_matchall_offload *cls)
 {
        struct netlink_ext_ack *extack = cls->common.extack;
@@ -466,11 +467,6 @@ int dpaa2_switch_cls_matchall_replace(struct dpaa2_switch_filter_block *block,
        struct flow_action_entry *act;
        int err;
 
-       if (!flow_offload_has_one_action(&cls->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;
@@ -501,6 +497,29 @@ free_acl_entry:
        return err;
 }
 
+int dpaa2_switch_cls_matchall_replace(struct dpaa2_switch_filter_block *block,
+                                     struct tc_cls_matchall_offload *cls)
+{
+       struct netlink_ext_ack *extack = cls->common.extack;
+       struct flow_action_entry *act;
+
+       if (!flow_offload_has_one_action(&cls->rule->action)) {
+               NL_SET_ERR_MSG(extack, "Only singular actions are supported");
+               return -EOPNOTSUPP;
+       }
+
+       act = &cls->rule->action.entries[0];
+       switch (act->id) {
+       case FLOW_ACTION_REDIRECT:
+       case FLOW_ACTION_TRAP:
+       case FLOW_ACTION_DROP:
+               return dpaa2_switch_cls_matchall_replace_acl(block, cls);
+       default:
+               NL_SET_ERR_MSG_MOD(extack, "Action not supported");
+               return -EOPNOTSUPP;
+       }
+}
+
 int dpaa2_switch_cls_matchall_destroy(struct dpaa2_switch_filter_block *block,
                                      struct tc_cls_matchall_offload *cls)
 {