net/iavf: fix overflow in maximum packet length config

[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 b669a16..d347f4d 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) {
@@ -264,6 +267,8 @@ dpaa2_create_dpdmux_device(int vdev_fd __rte_unused,
        struct dpaa2_dpdmux_dev *dpdmux_dev;
        struct dpdmux_attr attr;
        int ret;
+       uint16_t maj_ver;
+       uint16_t min_ver;
 
        PMD_INIT_FUNC_TRACE();
 
@@ -298,6 +303,48 @@ dpaa2_create_dpdmux_device(int vdev_fd __rte_unused,
                goto init_err;
        }
 
+       ret = dpdmux_get_api_version(&dpdmux_dev->dpdmux, CMD_PRI_LOW,
+                                       &maj_ver, &min_ver);
+       if (ret) {
+               DPAA2_PMD_ERR("setting version failed in %s",
+                               __func__);
+               goto init_err;
+       }
+
+       /* The new dpdmux_set/get_resetable() API are available starting with
+        * DPDMUX_VER_MAJOR==6 and DPDMUX_VER_MINOR==6
+        */
+       if (maj_ver >= 6 && min_ver >= 6) {
+               ret = dpdmux_set_resetable(&dpdmux_dev->dpdmux, CMD_PRI_LOW,
+                               dpdmux_dev->token,
+                               DPDMUX_SKIP_DEFAULT_INTERFACE |
+                               DPDMUX_SKIP_UNICAST_RULES |
+                               DPDMUX_SKIP_MULTICAST_RULES);
+               if (ret) {
+                       DPAA2_PMD_ERR("setting default interface failed in %s",
+                                     __func__);
+                       goto init_err;
+               }
+       }
+
+       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;