X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fenic%2Fenic_fm_flow.c;h=d815f369ed208315afa24a86bfe5d58ae69322c6;hb=2823b082f93c94c5c97fa572b5b84b637e088668;hp=e3e3d737bc05aa482afd6da1b10e9fa95e1cae0e;hpb=5fde1a75926bad69b430ce9d7e4da4e2447e1cb6;p=dpdk.git

diff --git a/drivers/net/enic/enic_fm_flow.c b/drivers/net/enic/enic_fm_flow.c
index e3e3d737bc..d815f369ed 100644
--- a/drivers/net/enic/enic_fm_flow.c
+++ b/drivers/net/enic/enic_fm_flow.c
@@ -10,6 +10,7 @@
 #include <rte_ether.h>
 #include <rte_ip.h>
 #include <rte_udp.h>
+#include <rte_memzone.h>
 
 #include "enic_compat.h"
 #include "enic.h"
@@ -630,7 +631,7 @@ enic_fet_alloc(struct enic_flowman *fm, uint8_t ingress,
 	struct fm_exact_match_table *cmd;
 	struct fm_header_set *hdr;
 	struct enic_fm_fet *fet;
-	u64 args[3];
+	uint64_t args[3];
 	int ret;
 
 	ENICPMD_FUNC_TRACE();
@@ -1067,7 +1068,7 @@ enic_fm_find_vnic(struct enic *enic, const struct rte_pci_addr *addr,
 		  uint64_t *handle)
 {
 	uint32_t bdf;
-	u64 args[2];
+	uint64_t args[2];
 	int rc;
 
 	ENICPMD_FUNC_TRACE();
@@ -1503,7 +1504,7 @@ enic_fm_dump_tcam_entry(const struct fm_tcam_match_entry *fm_match,
 			const struct fm_action *fm_action,
 			uint8_t ingress)
 {
-	if (rte_log_get_level(enic_pmd_logtype) < (int)RTE_LOG_DEBUG)
+	if (!rte_log_can_log(enic_pmd_logtype, RTE_LOG_DEBUG))
 		return;
 	enic_fm_dump_tcam_match(fm_match, ingress);
 	enic_fm_dump_tcam_actions(fm_action);
@@ -1601,7 +1602,7 @@ enic_fm_more_counters(struct enic_flowman *fm)
 	struct enic_fm_counter *ctrs;
 	struct enic *enic;
 	int i, rc;
-	u64 args[2];
+	uint64_t args[2];
 
 	ENICPMD_FUNC_TRACE();
 	enic = fm->enic;
@@ -1637,7 +1638,7 @@ static int
 enic_fm_counter_zero(struct enic_flowman *fm, struct enic_fm_counter *c)
 {
 	struct enic *enic;
-	u64 args[3];
+	uint64_t args[3];
 	int ret;
 
 	ENICPMD_FUNC_TRACE();
@@ -1679,7 +1680,7 @@ enic_fm_counter_alloc(struct enic_flowman *fm, struct rte_flow_error *error,
 static int
 enic_fm_action_free(struct enic_flowman *fm, uint64_t handle)
 {
-	u64 args[2];
+	uint64_t args[2];
 	int rc;
 
 	ENICPMD_FUNC_TRACE();
@@ -1695,7 +1696,7 @@ enic_fm_action_free(struct enic_flowman *fm, uint64_t handle)
 static int
 enic_fm_entry_free(struct enic_flowman *fm, uint64_t handle)
 {
-	u64 args[2];
+	uint64_t args[2];
 	int rc;
 
 	ENICPMD_FUNC_TRACE();
@@ -1794,7 +1795,7 @@ enic_fm_add_tcam_entry(struct enic_flowman *fm,
 		       struct rte_flow_error *error)
 {
 	struct fm_tcam_match_entry *ftm;
-	u64 args[3];
+	uint64_t args[3];
 	int ret;
 
 	ENICPMD_FUNC_TRACE();
@@ -1827,7 +1828,7 @@ enic_fm_add_exact_entry(struct enic_flowman *fm,
 			struct rte_flow_error *error)
 {
 	struct fm_exact_match_entry *fem;
-	u64 args[3];
+	uint64_t args[3];
 	int ret;
 
 	ENICPMD_FUNC_TRACE();
@@ -1885,7 +1886,7 @@ __enic_fm_flow_add_entry(struct enic_flowman *fm,
 	struct fm_action *fma;
 	uint64_t action_h;
 	uint64_t entry_h;
-	u64 args[3];
+	uint64_t args[3];
 	int ret;
 
 	ENICPMD_FUNC_TRACE();
@@ -2087,7 +2088,7 @@ enic_fm_flow_query_count(struct rte_eth_dev *dev,
 	struct rte_flow_query_count *query;
 	struct enic_fm_flow *fm_flow;
 	struct enic *enic;
-	u64 args[3];
+	uint64_t args[3];
 	int rc;
 
 	ENICPMD_FUNC_TRACE();
@@ -2251,7 +2252,7 @@ enic_fm_flow_flush(struct rte_eth_dev *dev,
 static int
 enic_fm_tbl_free(struct enic_flowman *fm, uint64_t handle)
 {
-	u64 args[2];
+	uint64_t args[2];
 	int rc;
 
 	args[0] = FM_MATCH_TABLE_FREE;
@@ -2269,7 +2270,7 @@ enic_fm_tcam_tbl_alloc(struct enic_flowman *fm, uint32_t direction,
 {
 	struct fm_tcam_match_table *tcam_tbl;
 	struct enic *enic;
-	u64 args[2];
+	uint64_t args[2];
 	int rc;
 
 	ENICPMD_FUNC_TRACE();
@@ -2304,7 +2305,7 @@ static void
 enic_fm_free_all_counters(struct enic_flowman *fm)
 {
 	struct enic *enic;
-	u64 args[2];
+	uint64_t args[2];
 	int rc;
 
 	enic = fm->enic;
@@ -2353,7 +2354,7 @@ int
 enic_fm_init(struct enic *enic)
 {
 	struct enic_flowman *fm;
-	u8 name[NAME_MAX];
+	uint8_t name[RTE_MEMZONE_NAMESIZE];
 	int rc;
 
 	if (enic->flow_filter_mode != FILTER_FLOWMAN)
@@ -2368,7 +2369,7 @@ enic_fm_init(struct enic *enic)
 	TAILQ_INIT(&fm->fet_list);
 	TAILQ_INIT(&fm->jump_list);
 	/* Allocate host memory for flowman commands */
-	snprintf((char *)name, NAME_MAX, "fm-cmd-%s", enic->bdf_name);
+	snprintf((char *)name, sizeof(name), "fm-cmd-%s", enic->bdf_name);
 	fm->cmd.va = enic_alloc_consistent(enic,
 		sizeof(union enic_flowman_cmd_mem), &fm->cmd.pa, name);
 	if (!fm->cmd.va) {