ethdev: separate driver APIs

[dpdk.git] / drivers / net / enic / enic_clsf.c

diff --git a/drivers/net/enic/enic_clsf.c b/drivers/net/enic/enic_clsf.c
index 487f804..3ef1d08 100644 (file)
--- a/drivers/net/enic/enic_clsf.c
+++ b/drivers/net/enic/enic_clsf.c
@@ -1,40 +1,11 @@
-/*
- * Copyright 2008-2014 Cisco Systems, Inc.  All rights reserved.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2008-2017 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
- *
- * Copyright (c) 2014, Cisco Systems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
  */
 
 #include <libgen.h>
 
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_hash.h>
 #include <rte_byteorder.h>
@@ -57,7 +28,7 @@
 #include "vnic_intr.h"
 #include "vnic_nic.h"
 
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#ifdef RTE_ARCH_X86
 #include <rte_hash_crc.h>
 #define DEFAULT_HASH_FUNC       rte_hash_crc
 #else
@@ -345,7 +316,7 @@ int enic_fdir_del_fltr(struct enic *enic, struct rte_eth_fdir_filter *params)
 
                /* Delete the filter */
                vnic_dev_classifier(enic->vdev, CLSF_DEL,
-                       &key->fltr_id, NULL);
+                       &key->fltr_id, NULL, NULL);
                rte_free(key);
                enic->fdir.nodes[pos] = NULL;
                enic->fdir.stats.free++;
@@ -365,8 +336,10 @@ int enic_fdir_add_fltr(struct enic *enic, struct rte_eth_fdir_filter *params)
        u32 flowtype_supported;
        u16 flex_bytes;
        u16 queue;
+       struct filter_action_v2 action;
 
        memset(&fltr, 0, sizeof(fltr));
+       memset(&action, 0, sizeof(action));
        flowtype_supported = enic->fdir.types_mask
                             & (1 << params->input.flow_type);
 
@@ -439,7 +412,7 @@ int enic_fdir_add_fltr(struct enic *enic, struct rte_eth_fdir_filter *params)
                         * Delete the filter and add the modified one later
                         */
                        vnic_dev_classifier(enic->vdev, CLSF_DEL,
-                               &key->fltr_id, NULL);
+                               &key->fltr_id, NULL, NULL);
                        enic->fdir.stats.free++;
                }
 
@@ -451,8 +424,11 @@ int enic_fdir_add_fltr(struct enic *enic, struct rte_eth_fdir_filter *params)
 
        enic->fdir.copy_fltr_fn(&fltr, &params->input,
                                &enic->rte_dev->data->dev_conf.fdir_conf.mask);
+       action.type = FILTER_ACTION_RQ_STEERING;
+       action.rq_idx = queue;
 
-       if (!vnic_dev_classifier(enic->vdev, CLSF_ADD, &queue, &fltr)) {
+       if (!vnic_dev_classifier(enic->vdev, CLSF_ADD, &queue, &fltr,
+           &action)) {
                key->fltr_id = queue;
        } else {
                dev_err(enic, "Add classifier entry failed\n");
@@ -462,7 +438,8 @@ int enic_fdir_add_fltr(struct enic *enic, struct rte_eth_fdir_filter *params)
        }
 
        if (do_free)
-               vnic_dev_classifier(enic->vdev, CLSF_DEL, &old_fltr_id, NULL);
+               vnic_dev_classifier(enic->vdev, CLSF_DEL, &old_fltr_id, NULL,
+                                   NULL);
        else{
                enic->fdir.stats.free--;
                enic->fdir.stats.add++;
@@ -488,7 +465,7 @@ void enic_clsf_destroy(struct enic *enic)
                key = enic->fdir.nodes[index];
                if (key) {
                        vnic_dev_classifier(enic->vdev, CLSF_DEL,
-                               &key->fltr_id, NULL);
+                               &key->fltr_id, NULL, NULL);
                        rte_free(key);
                        enic->fdir.nodes[index] = NULL;
                }