Change prefix km_ (key matcher) to prefix nthw_km_ for flow_api module.
Signed-off-by: Serhii Iliushyk <sil-...@napatech.com>
---
drivers/net/ntnic/include/flow_api_engine.h | 18 ++--
drivers/net/ntnic/nthw/flow_api/flow_api.c | 4 +-
drivers/net/ntnic/nthw/flow_api/flow_kcc.c | 2 +-
drivers/net/ntnic/nthw/flow_api/flow_km.c | 16 +--
.../profile_inline/flow_api_profile_inline.c | 99 ++++++++++---------
5 files changed, 75 insertions(+), 64 deletions(-)
diff --git a/drivers/net/ntnic/include/flow_api_engine.h
b/drivers/net/ntnic/include/flow_api_engine.h
index 6401c79e3c..6a27ba8e12 100644
--- a/drivers/net/ntnic/include/flow_api_engine.h
+++ b/drivers/net/ntnic/include/flow_api_engine.h
@@ -396,26 +396,26 @@ struct flow_template_table {
uint16_t caller_id;
};
-void km_attach_ndev_resource_management(struct km_flow_def_s *km, void
**handle);
-void km_free_ndev_resource_management(void **handle);
+void nthw_km_attach_ndev_resource_management(struct km_flow_def_s *km, void
**handle);
+void nthw_km_free_ndev_resource_management(void **handle);
-int km_add_match_elem(struct km_flow_def_s *km, uint32_t e_word[4], uint32_t
e_mask[4],
+int nthw_km_add_match_elem(struct km_flow_def_s *km, uint32_t e_word[4],
uint32_t e_mask[4],
uint32_t word_len, enum frame_offs_e start, int8_t offset);
-int km_key_create(struct km_flow_def_s *km, uint32_t port_id);
+int nthw_km_key_create(struct km_flow_def_s *km, uint32_t port_id);
/*
* Compares 2 KM key definitions after first collect validate and optimization.
* km is compared against an existing km1.
* if identical, km1 flow_type is returned
*/
-int km_key_compare(struct km_flow_def_s *km, struct km_flow_def_s *km1);
+int nthw_km_key_compare(struct km_flow_def_s *km, struct km_flow_def_s *km1);
-int km_rcp_set(struct km_flow_def_s *km, int index);
+int nthw_km_rcp_set(struct km_flow_def_s *km, int index);
-int km_write_data_match_entry(struct km_flow_def_s *km, uint32_t color);
-int km_clear_data_match_entry(struct km_flow_def_s *km);
+int nthw_km_write_data_match_entry(struct km_flow_def_s *km, uint32_t color);
+int nthw_km_clear_data_match_entry(struct km_flow_def_s *km);
-void kcc_free_ndev_resource_management(void **handle);
+void nthw_kcc_free_ndev_resource_mgmnt(void **handle);
/*
* Group management
diff --git a/drivers/net/ntnic/nthw/flow_api/flow_api.c
b/drivers/net/ntnic/nthw/flow_api/flow_api.c
index 4c7bb4a60a..4d1c9c8d7c 100644
--- a/drivers/net/ntnic/nthw/flow_api/flow_api.c
+++ b/drivers/net/ntnic/nthw/flow_api/flow_api.c
@@ -478,8 +478,8 @@ static void flow_ndev_reset(struct flow_nic_dev *ndev)
profile_inline_ops->nthw_done_flow_mgmnt_of_ndev_profile_inline(ndev);
- km_free_ndev_resource_management(&ndev->km_res_handle);
- kcc_free_ndev_resource_management(&ndev->kcc_res_handle);
+ nthw_km_free_ndev_resource_management(&ndev->km_res_handle);
+ nthw_kcc_free_ndev_resource_mgmnt(&ndev->kcc_res_handle);
ndev->flow_unique_id_counter = 0;
diff --git a/drivers/net/ntnic/nthw/flow_api/flow_kcc.c
b/drivers/net/ntnic/nthw/flow_api/flow_kcc.c
index e99e63d9f1..47311729ea 100644
--- a/drivers/net/ntnic/nthw/flow_api/flow_kcc.c
+++ b/drivers/net/ntnic/nthw/flow_api/flow_kcc.c
@@ -8,7 +8,7 @@
#include "hw_mod_backend.h"
#include "flow_api_engine.h"
-void kcc_free_ndev_resource_management(void **handle)
+void nthw_kcc_free_ndev_resource_mgmnt(void **handle)
{
if (*handle) {
free(*handle);
diff --git a/drivers/net/ntnic/nthw/flow_api/flow_km.c
b/drivers/net/ntnic/nthw/flow_api/flow_km.c
index 1052773668..4ccd77895b 100644
--- a/drivers/net/ntnic/nthw/flow_api/flow_km.c
+++ b/drivers/net/ntnic/nthw/flow_api/flow_km.c
@@ -73,7 +73,7 @@ struct tcam_distrib_s {
static int tcam_find_mapping(struct km_flow_def_s *km);
-void km_attach_ndev_resource_management(struct km_flow_def_s *km, void
**handle)
+void nthw_km_attach_ndev_resource_management(struct km_flow_def_s *km, void
**handle)
{
/*
* KM entries occupied in CAM - to manage the cuckoo shuffling
@@ -100,7 +100,7 @@ void km_attach_ndev_resource_management(struct
km_flow_def_s *km, void **handle)
nthw_init_hasher(km->hsh, km->be->km.nb_cam_banks,
km->be->km.nb_cam_records);
}
-void km_free_ndev_resource_management(void **handle)
+void nthw_km_free_ndev_resource_management(void **handle)
{
if (*handle) {
free(*handle);
@@ -110,7 +110,7 @@ void km_free_ndev_resource_management(void **handle)
*handle = NULL;
}
-int km_add_match_elem(struct km_flow_def_s *km, uint32_t e_word[4], uint32_t
e_mask[4],
+int nthw_km_add_match_elem(struct km_flow_def_s *km, uint32_t e_word[4],
uint32_t e_mask[4],
uint32_t word_len, enum frame_offs_e start_id, int8_t offset)
{
/* valid word_len 1,2,4 */
@@ -173,7 +173,7 @@ static int get_word(struct km_flow_def_s *km, uint32_t
size, int marked[])
return -1;
}
-int km_key_create(struct km_flow_def_s *km, uint32_t port_id)
+int nthw_km_key_create(struct km_flow_def_s *km, uint32_t port_id)
{
/*
* Create combined extractor mappings
@@ -377,7 +377,7 @@ int km_key_create(struct km_flow_def_s *km, uint32_t
port_id)
return 0;
}
-int km_key_compare(struct km_flow_def_s *km, struct km_flow_def_s *km1)
+int nthw_km_key_compare(struct km_flow_def_s *km, struct km_flow_def_s *km1)
{
if (km->target != km1->target || km->num_ftype_elem !=
km1->num_ftype_elem ||
km->key_word_size != km1->key_word_size || km->info_set !=
km1->info_set)
@@ -473,7 +473,7 @@ int km_key_compare(struct km_flow_def_s *km, struct
km_flow_def_s *km1)
return km1->flow_type;
}
-int km_rcp_set(struct km_flow_def_s *km, int index)
+int nthw_km_rcp_set(struct km_flow_def_s *km, int index)
{
int qw = 0;
int sw = 0;
@@ -1101,7 +1101,7 @@ static int tcam_reset_entry(struct km_flow_def_s *km)
return err;
}
-int km_write_data_match_entry(struct km_flow_def_s *km, uint32_t color)
+int nthw_km_write_data_match_entry(struct km_flow_def_s *km, uint32_t color)
{
int res = -1;
@@ -1125,7 +1125,7 @@ int km_write_data_match_entry(struct km_flow_def_s *km,
uint32_t color)
return res;
}
-int km_clear_data_match_entry(struct km_flow_def_s *km)
+int nthw_km_clear_data_match_entry(struct km_flow_def_s *km)
{
int res = 0;
diff --git
a/drivers/net/ntnic/nthw/flow_api/profile_inline/flow_api_profile_inline.c
b/drivers/net/ntnic/nthw/flow_api/profile_inline/flow_api_profile_inline.c
index 6fc496e16a..e0cdd12626 100644
--- a/drivers/net/ntnic/nthw/flow_api/profile_inline/flow_api_profile_inline.c
+++ b/drivers/net/ntnic/nthw/flow_api/profile_inline/flow_api_profile_inline.c
@@ -1725,7 +1725,7 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
sw_mask[0] = 0x0fff;
sw_data[0] = implicit_vlan_vid & sw_mask[0];
- km_add_match_elem(&fd->km, &sw_data[0], &sw_mask[0], 1,
DYN_FIRST_VLAN, 0);
+ nthw_km_add_match_elem(&fd->km, &sw_data[0], &sw_mask[0], 1,
DYN_FIRST_VLAN, 0);
set_key_def_sw(key_def, sw_counter, DYN_FIRST_VLAN, 0);
sw_counter += 1;
@@ -1874,7 +1874,7 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
qw_mask[3] =
ntohs(eth_mask->ether_type) << 16;
- km_add_match_elem(&fd->km,
+ nthw_km_add_match_elem(&fd->km,
&qw_data[(size_t)(qw_counter *
4)],
&qw_mask[(size_t)(qw_counter *
4)], 4, DYN_L2, 0);
set_key_def_qw(key_def, qw_counter,
DYN_L2, 0);
@@ -1897,7 +1897,7 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
sw_mask[0] =
ntohs(eth_mask->ether_type) << 16;
sw_data[0] =
ntohs(eth_spec->ether_type) << 16 & sw_mask[0];
- km_add_match_elem(&fd->km, &sw_data[0],
+ nthw_km_add_match_elem(&fd->km,
&sw_data[0],
&sw_mask[0], 1, DYN_L2, 12);
set_key_def_sw(key_def, sw_counter,
DYN_L2, 12);
sw_counter += 1;
@@ -1944,7 +1944,7 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
ntohs(vlan_spec->eth_proto);
sw_data[0] &= sw_mask[0];
- km_add_match_elem(&fd->km, &sw_data[0],
&sw_mask[0], 1,
+ nthw_km_add_match_elem(&fd->km,
&sw_data[0], &sw_mask[0], 1,
DYN_FIRST_VLAN, 2 + 4 *
fd->vlans);
set_key_def_sw(key_def, sw_counter,
DYN_FIRST_VLAN,
2 + 4 * fd->vlans);
@@ -1971,7 +1971,7 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
qw_data[2] &= qw_mask[2];
qw_data[3] &= qw_mask[3];
- km_add_match_elem(&fd->km, &qw_data[0],
&qw_mask[0], 4,
+ nthw_km_add_match_elem(&fd->km,
&qw_data[0], &qw_mask[0], 4,
DYN_FIRST_VLAN, 2 + 4 *
fd->vlans);
set_key_def_qw(key_def, qw_counter,
DYN_FIRST_VLAN,
2 + 4 * fd->vlans);
@@ -2066,7 +2066,7 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
qw_data[2] =
ntohl(ipv4_spec->hdr.src_addr) & qw_mask[2];
qw_data[3] =
ntohl(ipv4_spec->hdr.dst_addr) & qw_mask[3];
- km_add_match_elem(&fd->km, &qw_data[0],
&qw_mask[0], 4,
+ nthw_km_add_match_elem(&fd->km,
&qw_data[0], &qw_mask[0], 4,
any_count > 0 ? DYN_TUN_L3 :
DYN_L3, 4);
set_key_def_qw(key_def, qw_counter,
any_count > 0
? DYN_TUN_L3 : DYN_L3, 4);
@@ -2094,7 +2094,7 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
sw_mask[0] =
ntohl(ipv4_mask->hdr.src_addr);
sw_data[0] =
ntohl(ipv4_spec->hdr.src_addr) & sw_mask[0];
- km_add_match_elem(&fd->km, &sw_data[0],
&sw_mask[0], 1,
+ nthw_km_add_match_elem(&fd->km,
&sw_data[0], &sw_mask[0], 1,
any_count > 0 ? DYN_TUN_L3 :
DYN_L3, 12);
set_key_def_sw(key_def, sw_counter,
any_count > 0
? DYN_TUN_L3 : DYN_L3, 12);
@@ -2115,7 +2115,7 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
sw_mask[0] =
ntohl(ipv4_mask->hdr.dst_addr);
sw_data[0] =
ntohl(ipv4_spec->hdr.dst_addr) & sw_mask[0];
- km_add_match_elem(&fd->km, &sw_data[0],
&sw_mask[0], 1,
+ nthw_km_add_match_elem(&fd->km,
&sw_data[0], &sw_mask[0], 1,
any_count > 0 ? DYN_TUN_L3 :
DYN_L3, 16);
set_key_def_sw(key_def, sw_counter,
any_count > 0
? DYN_TUN_L3 : DYN_L3, 16);
@@ -2137,7 +2137,7 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
sw_data[0] =
ipv4_spec->hdr.next_proto_id
<< 16 & sw_mask[0];
- km_add_match_elem(&fd->km, &sw_data[0],
&sw_mask[0], 1,
+ nthw_km_add_match_elem(&fd->km,
&sw_data[0], &sw_mask[0], 1,
any_count > 0 ? DYN_TUN_L3 :
DYN_L3, 8);
set_key_def_sw(key_def, sw_counter,
any_count > 0
? DYN_TUN_L3 : DYN_L3, 8);
@@ -2208,7 +2208,7 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
qw_data[2] &= qw_mask[2];
qw_data[3] &= qw_mask[3];
- km_add_match_elem(&fd->km, &qw_data[0],
&qw_mask[0], 4,
+ nthw_km_add_match_elem(&fd->km,
&qw_data[0], &qw_mask[0], 4,
any_count > 0 ? DYN_TUN_L3 :
DYN_L3, 8);
set_key_def_qw(key_def, qw_counter,
any_count > 0
? DYN_TUN_L3 : DYN_L3, 8);
@@ -2244,7 +2244,7 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
qw_data[2] &= qw_mask[2];
qw_data[3] &= qw_mask[3];
- km_add_match_elem(&fd->km, &qw_data[0],
&qw_mask[0], 4,
+ nthw_km_add_match_elem(&fd->km,
&qw_data[0], &qw_mask[0], 4,
any_count > 0 ? DYN_TUN_L3 :
DYN_L3, 24);
set_key_def_qw(key_def, qw_counter,
any_count > 0
? DYN_TUN_L3 : DYN_L3, 24);
@@ -2259,8 +2259,9 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
sw_mask[0] =
ipv6_mask->hdr.proto << 8;
sw_data[0] =
ipv6_spec->hdr.proto << 8 & sw_mask[0];
- km_add_match_elem(&fd->km,
&sw_data[0], &sw_mask[0],
- 1, any_count > 0 ?
DYN_TUN_L3 : DYN_L3, 4);
+ nthw_km_add_match_elem(&fd->km,
+ &sw_data[0],
&sw_mask[0], 1,
+ any_count > 0 ?
DYN_TUN_L3 : DYN_L3, 4);
set_key_def_sw(key_def,
sw_counter, any_count > 0
? DYN_TUN_L3 : DYN_L3,
4);
sw_counter += 1;
@@ -2286,8 +2287,9 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
qw_data[2] &= qw_mask[2];
qw_data[3] &= qw_mask[3];
- km_add_match_elem(&fd->km,
&qw_data[0], &qw_mask[0],
- 4, any_count > 0 ?
DYN_TUN_L3 : DYN_L3, 0);
+ nthw_km_add_match_elem(&fd->km,
+ &qw_data[0],
&qw_mask[0], 4,
+ any_count > 0 ?
DYN_TUN_L3 : DYN_L3, 0);
set_key_def_qw(key_def,
qw_counter, any_count > 0
? DYN_TUN_L3 : DYN_L3,
0);
qw_counter += 1;
@@ -2349,8 +2351,9 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
<< 16) |
ntohs(udp_spec->hdr.dst_port)) &
sw_mask[0];
- km_add_match_elem(&fd->km,
&sw_data[0], &sw_mask[0],
- 1, any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
+ nthw_km_add_match_elem(&fd->km,
+ &sw_data[0],
&sw_mask[0], 1,
+ any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
set_key_def_sw(key_def,
sw_counter, any_count > 0
? DYN_TUN_L4 : DYN_L4,
0);
sw_counter += 1;
@@ -2378,8 +2381,9 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
qw_data[2] &= qw_mask[2];
qw_data[3] &= qw_mask[3];
- km_add_match_elem(&fd->km,
&qw_data[0], &qw_mask[0],
- 4, any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
+ nthw_km_add_match_elem(&fd->km,
+ &qw_data[0],
&qw_mask[0], 4,
+ any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
set_key_def_qw(key_def,
qw_counter, any_count > 0
? DYN_TUN_L4 : DYN_L4,
0);
qw_counter += 1;
@@ -2443,8 +2447,9 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
<< 16) |
ntohs(sctp_spec->hdr.dst_port)) &
sw_mask[0];
- km_add_match_elem(&fd->km,
&sw_data[0], &sw_mask[0],
- 1, any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
+ nthw_km_add_match_elem(&fd->km,
+ &sw_data[0],
&sw_mask[0], 1,
+ any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
set_key_def_sw(key_def,
sw_counter, any_count > 0
? DYN_TUN_L4 : DYN_L4,
0);
sw_counter += 1;
@@ -2472,8 +2477,9 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
qw_data[2] &= qw_mask[2];
qw_data[3] &= qw_mask[3];
- km_add_match_elem(&fd->km,
&qw_data[0], &qw_mask[0],
- 4, any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
+ nthw_km_add_match_elem(&fd->km,
+ &qw_data[0],
&qw_mask[0], 4,
+ any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
set_key_def_qw(key_def,
qw_counter, any_count > 0
? DYN_TUN_L4 : DYN_L4,
0);
qw_counter += 1;
@@ -2541,7 +2547,7 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
icmp_spec->hdr.icmp_code << 16;
sw_data[0] &= sw_mask[0];
- km_add_match_elem(&fd->km,
&sw_data[0],
+ nthw_km_add_match_elem(&fd->km,
&sw_data[0],
&sw_mask[0], 1,
any_count > 0
? DYN_TUN_L4 : DYN_L4,
0);
set_key_def_sw(key_def,
sw_counter,
@@ -2571,8 +2577,9 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
qw_data[2] &= qw_mask[2];
qw_data[3] &= qw_mask[3];
- km_add_match_elem(&fd->km,
&qw_data[0], &qw_mask[0],
- 4, any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
+ nthw_km_add_match_elem(&fd->km,
+ &qw_data[0],
&qw_mask[0], 4,
+ any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
set_key_def_qw(key_def,
qw_counter, any_count > 0
? DYN_TUN_L4 : DYN_L4,
0);
qw_counter += 1;
@@ -2640,8 +2647,9 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
icmp_spec->code << 16;
sw_data[0] &= sw_mask[0];
- km_add_match_elem(&fd->km,
&sw_data[0], &sw_mask[0],
- 1, any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
+ nthw_km_add_match_elem(&fd->km,
+ &sw_data[0],
&sw_mask[0], 1,
+ any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
set_key_def_sw(key_def,
sw_counter, any_count > 0
? DYN_TUN_L4 : DYN_L4,
0);
@@ -2670,8 +2678,9 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
qw_data[2] &= qw_mask[2];
qw_data[3] &= qw_mask[3];
- km_add_match_elem(&fd->km,
&qw_data[0], &qw_mask[0],
- 4, any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
+ nthw_km_add_match_elem(&fd->km,
+ &qw_data[0],
&qw_mask[0], 4,
+ any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
set_key_def_qw(key_def,
qw_counter, any_count > 0
? DYN_TUN_L4 : DYN_L4,
0);
qw_counter += 1;
@@ -2743,8 +2752,9 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
((ntohs(tcp_spec->hdr.src_port) << 16) |
ntohs(tcp_spec->hdr.dst_port)) & sw_mask[0];
- km_add_match_elem(&fd->km,
&sw_data[0], &sw_mask[0],
- 1, any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
+ nthw_km_add_match_elem(&fd->km,
+ &sw_data[0],
&sw_mask[0], 1,
+ any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
set_key_def_sw(key_def,
sw_counter, any_count > 0
? DYN_TUN_L4 : DYN_L4,
0);
sw_counter += 1;
@@ -2772,8 +2782,9 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
qw_data[2] &= qw_mask[2];
qw_data[3] &= qw_mask[3];
- km_add_match_elem(&fd->km,
&qw_data[0], &qw_mask[0],
- 4, any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
+ nthw_km_add_match_elem(&fd->km,
+ &qw_data[0],
&qw_mask[0], 4,
+ any_count > 0 ?
DYN_TUN_L4 : DYN_L4, 0);
set_key_def_qw(key_def,
qw_counter, any_count > 0
? DYN_TUN_L4 : DYN_L4,
0);
qw_counter += 1;
@@ -2832,7 +2843,7 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
sw_data[0] =
ntohl(gtp_spec->teid) &
sw_mask[0];
- km_add_match_elem(&fd->km,
&sw_data[0],
+ nthw_km_add_match_elem(&fd->km,
&sw_data[0],
&sw_mask[0], 1,
DYN_L4_PAYLOAD, 4);
set_key_def_sw(key_def,
sw_counter,
@@ -2862,7 +2873,7 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
qw_data[2] &= qw_mask[2];
qw_data[3] &= qw_mask[3];
- km_add_match_elem(&fd->km,
&qw_data[0],
+ nthw_km_add_match_elem(&fd->km,
&qw_data[0],
&qw_mask[0], 4,
DYN_L4_PAYLOAD, 4);
set_key_def_qw(key_def,
qw_counter,
@@ -2916,7 +2927,7 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
sw_data[0] =
ntohl(gtp_psc_spec->qfi) &
sw_mask[0];
- km_add_match_elem(&fd->km,
&sw_data[0],
+ nthw_km_add_match_elem(&fd->km,
&sw_data[0],
&sw_mask[0], 1,
DYN_L4_PAYLOAD, 14);
set_key_def_sw(key_def,
sw_counter,
@@ -2946,7 +2957,7 @@ static int interpret_flow_elements(const struct
flow_eth_dev *dev,
qw_data[2] &= qw_mask[2];
qw_data[3] &= qw_mask[3];
- km_add_match_elem(&fd->km,
&qw_data[0],
+ nthw_km_add_match_elem(&fd->km,
&qw_data[0],
&qw_mask[0], 4,
DYN_L4_PAYLOAD, 14);
set_key_def_qw(key_def,
qw_counter,
@@ -3713,7 +3724,7 @@ static struct flow_handle *create_flow_filter(struct
flow_eth_dev *dev, struct n
if (fd->km.num_ftype_elem) {
struct flow_handle *flow = dev->ndev->flow_base,
*found_flow = NULL;
- if (km_key_create(&fd->km, fh->port_id)) {
+ if (nthw_km_key_create(&fd->km, fh->port_id)) {
NT_LOG(ERR, FILTER, "KM creation failed");
nthw_flow_nic_set_error(ERR_MATCH_FAILED_BY_HW_LIMITS, error);
goto error_out;
@@ -3725,7 +3736,7 @@ static struct flow_handle *create_flow_filter(struct
flow_eth_dev *dev, struct n
while (flow) {
if (flow->type == FLOW_HANDLE_TYPE_FLOW &&
flow->fd->km.flow_type) {
- int res = km_key_compare(&fd->km,
&flow->fd->km);
+ int res = nthw_km_key_compare(&fd->km,
&flow->fd->km);
if (res < 0) {
/* Flow rcp and match data is
identical */
@@ -3743,7 +3754,7 @@ static struct flow_handle *create_flow_filter(struct
flow_eth_dev *dev, struct n
flow = flow->next;
}
- km_attach_ndev_resource_management(&fd->km,
&dev->ndev->km_res_handle);
+ nthw_km_attach_ndev_resource_management(&fd->km,
&dev->ndev->km_res_handle);
if (found_flow != NULL) {
/* Reuse existing KM RCP */
@@ -3778,7 +3789,7 @@ static struct flow_handle *create_flow_filter(struct
flow_eth_dev *dev, struct n
goto error_out;
}
- km_rcp_set(&fd->km, rcp);
+ nthw_km_rcp_set(&fd->km, rcp);
km_rcp_data.rcp = (uint32_t)rcp;
}
}
@@ -3832,7 +3843,7 @@ static struct flow_handle *create_flow_filter(struct
flow_eth_dev *dev, struct n
nthw_mod_km_rcp_flush(&dev->ndev->be,
(int)km_rcp_data.rcp, 1);
- km_write_data_match_entry(&fd->km, 0);
+ nthw_km_write_data_match_entry(&fd->km, 0);
}
/* Setup Match Set */
@@ -4298,7 +4309,7 @@ int nthw_flow_destroy_locked_profile_inline(struct
flow_eth_dev *dev,
NT_LOG(DBG, FILTER, "removing flow :%p", fh);
if (fh->fd->km.num_ftype_elem) {
- km_clear_data_match_entry(&fh->fd->km);
+ nthw_km_clear_data_match_entry(&fh->fd->km);
const struct hw_db_inline_km_rcp_data
*other_km_rcp_data =
nthw_db_inline_find_data(dev->ndev,
dev->ndev->hw_db_handle,
--
2.45.0
