net/dpaa2: fix dpdmux default interface

[dpdk.git] / drivers / net / dpaa2 / dpaa2_mux.c

diff --git a/drivers/net/dpaa2/dpaa2_mux.c b/drivers/net/dpaa2/dpaa2_mux.c
index 1ff00ca..e8689a7 100644 (file)
--- a/drivers/net/dpaa2/dpaa2_mux.c
+++ b/drivers/net/dpaa2/dpaa2_mux.c
@@ -68,6 +68,9 @@ rte_pmd_dpaa2_mux_flow_create(uint32_t dpdmux_id,
        int ret;
        static int i;
 
+       if (!pattern || !actions || !pattern[0] || !actions[0])
+               return NULL;
+
        /* Find the DPDMUX from dpdmux_id in our list */
        dpdmux_dev = get_dpdmux_from_id(dpdmux_id);
        if (!dpdmux_dev) {
@@ -92,7 +95,7 @@ rte_pmd_dpaa2_mux_flow_create(uint32_t dpdmux_id,
        mask_iova = (void *)((size_t)key_iova + DIST_PARAM_IOVA_SIZE);
 
        /* Currently taking only IP protocol as an extract type.
-        * This can be exended to other fields using pattern->type.
+        * This can be extended to other fields using pattern->type.
         */
        memset(&kg_cfg, 0, sizeof(struct dpkg_profile_cfg));
 
@@ -293,7 +296,7 @@ dpaa2_create_dpdmux_device(int vdev_fd __rte_unused,
        }
 
        ret = dpdmux_if_set_default(&dpdmux_dev->dpdmux, CMD_PRI_LOW,
-                                   dpdmux_dev->token, 1);
+                                   dpdmux_dev->token, attr.default_if);
        if (ret) {
                DPAA2_PMD_ERR("setting default interface failed in %s",
                              __func__);
@@ -324,6 +327,24 @@ dpaa2_create_dpdmux_device(int vdev_fd __rte_unused,
                }
        }
 
+       if (maj_ver >= 6 && min_ver >= 9) {
+               struct dpdmux_error_cfg mux_err_cfg;
+
+               memset(&mux_err_cfg, 0, sizeof(mux_err_cfg));
+               mux_err_cfg.error_action = DPDMUX_ERROR_ACTION_CONTINUE;
+               mux_err_cfg.errors = DPDMUX_ERROR_DISC;
+
+               ret = dpdmux_if_set_errors_behavior(&dpdmux_dev->dpdmux,
+                               CMD_PRI_LOW,
+                               dpdmux_dev->token, dpdmux_id,
+                               &mux_err_cfg);
+               if (ret) {
+                       DPAA2_PMD_ERR("dpdmux_if_set_errors_behavior %s err %d",
+                                     __func__, ret);
+                       goto init_err;
+               }
+       }
+
        dpdmux_dev->dpdmux_id = dpdmux_id;
        dpdmux_dev->num_ifs = attr.num_ifs;
 
@@ -332,8 +353,7 @@ dpaa2_create_dpdmux_device(int vdev_fd __rte_unused,
        return 0;
 
 init_err:
-       if (dpdmux_dev)
-               rte_free(dpdmux_dev);
+       rte_free(dpdmux_dev);
 
        return -1;
 }