New upstream version 18.11-rc1

[deb_dpdk.git] / drivers / net / softnic / rte_eth_softnic_action.c

diff --git a/drivers/net/softnic/rte_eth_softnic_action.c b/drivers/net/softnic/rte_eth_softnic_action.c
index c25f4dd..92c744d 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic_action.c
+++ b/drivers/net/softnic/rte_eth_softnic_action.c
@@ -7,8 +7,8 @@
 #include <string.h>
 
 #include <rte_string_fns.h>
+#include <rte_table_hash_func.h>
 
-#include "hash_func.h"
 #include "rte_eth_softnic_internals.h"
 
 /**
@@ -72,35 +72,35 @@ softnic_port_in_action_profile_create(struct pmd_internals *p,
                params->lb.f_hash == NULL) {
                switch (params->lb.key_size) {
                case  8:
-                       params->lb.f_hash = hash_default_key8;
+                       params->lb.f_hash = rte_table_hash_crc_key8;
                        break;
 
                case 16:
-                       params->lb.f_hash = hash_default_key16;
+                       params->lb.f_hash = rte_table_hash_crc_key16;
                        break;
 
                case 24:
-                       params->lb.f_hash = hash_default_key24;
+                       params->lb.f_hash = rte_table_hash_crc_key24;
                        break;
 
                case 32:
-                       params->lb.f_hash = hash_default_key32;
+                       params->lb.f_hash = rte_table_hash_crc_key32;
                        break;
 
                case 40:
-                       params->lb.f_hash = hash_default_key40;
+                       params->lb.f_hash = rte_table_hash_crc_key40;
                        break;
 
                case 48:
-                       params->lb.f_hash = hash_default_key48;
+                       params->lb.f_hash = rte_table_hash_crc_key48;
                        break;
 
                case 56:
-                       params->lb.f_hash = hash_default_key56;
+                       params->lb.f_hash = rte_table_hash_crc_key56;
                        break;
 
                case 64:
-                       params->lb.f_hash = hash_default_key64;
+                       params->lb.f_hash = rte_table_hash_crc_key64;
                        break;
 
                default:
@@ -223,35 +223,35 @@ softnic_table_action_profile_create(struct pmd_internals *p,
                params->lb.f_hash == NULL) {
                switch (params->lb.key_size) {
                case 8:
-                       params->lb.f_hash = hash_default_key8;
+                       params->lb.f_hash = rte_table_hash_crc_key8;
                        break;
 
                case 16:
-                       params->lb.f_hash = hash_default_key16;
+                       params->lb.f_hash = rte_table_hash_crc_key16;
                        break;
 
                case 24:
-                       params->lb.f_hash = hash_default_key24;
+                       params->lb.f_hash = rte_table_hash_crc_key24;
                        break;
 
                case 32:
-                       params->lb.f_hash = hash_default_key32;
+                       params->lb.f_hash = rte_table_hash_crc_key32;
                        break;
 
                case 40:
-                       params->lb.f_hash = hash_default_key40;
+                       params->lb.f_hash = rte_table_hash_crc_key40;
                        break;
 
                case 48:
-                       params->lb.f_hash = hash_default_key48;
+                       params->lb.f_hash = rte_table_hash_crc_key48;
                        break;
 
                case 56:
-                       params->lb.f_hash = hash_default_key56;
+                       params->lb.f_hash = rte_table_hash_crc_key56;
                        break;
 
                case 64:
-                       params->lb.f_hash = hash_default_key64;
+                       params->lb.f_hash = rte_table_hash_crc_key64;
                        break;
 
                default:
@@ -364,6 +364,39 @@ softnic_table_action_profile_create(struct pmd_internals *p,
                }
        }
 
+       if (params->action_mask & (1LLU << RTE_TABLE_ACTION_TAG)) {
+               status = rte_table_action_profile_action_register(ap,
+                       RTE_TABLE_ACTION_TAG,
+                       NULL);
+
+               if (status) {
+                       rte_table_action_profile_free(ap);
+                       return NULL;
+               }
+       }
+
+       if (params->action_mask & (1LLU << RTE_TABLE_ACTION_DECAP)) {
+               status = rte_table_action_profile_action_register(ap,
+                       RTE_TABLE_ACTION_DECAP,
+                       NULL);
+
+               if (status) {
+                       rte_table_action_profile_free(ap);
+                       return NULL;
+               }
+       }
+
+       if (params->action_mask & (1LLU << RTE_TABLE_ACTION_SYM_CRYPTO)) {
+               status = rte_table_action_profile_action_register(ap,
+                       RTE_TABLE_ACTION_SYM_CRYPTO,
+                       &params->sym_crypto);
+
+               if (status) {
+                       rte_table_action_profile_free(ap);
+                       return NULL;
+               }
+       }
+
        status = rte_table_action_profile_freeze(ap);
        if (status) {
                rte_table_action_profile_free(ap);