X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fenic%2Fbase%2Fvnic_cq.c;h=51d6fd387b2915e37e7f413138ebfc89e28c3f3d;hb=57ddbf7edd9c5041603e224fbbb62c11ce423135;hp=63a503f2b29dfce6d304bc41b5433fca1f05f891;hpb=2e99ea80f8bc0f10e9e7226e6cea3aa307891727;p=dpdk.git

diff --git a/drivers/net/enic/base/vnic_cq.c b/drivers/net/enic/base/vnic_cq.c
index 63a503f2b2..51d6fd387b 100644
--- a/drivers/net/enic/base/vnic_cq.c
+++ b/drivers/net/enic/base/vnic_cq.c
@@ -5,6 +5,7 @@
 
 #include "vnic_dev.h"
 #include "vnic_cq.h"
+#include <rte_memzone.h>
 
 void vnic_cq_free(struct vnic_cq *cq)
 {
@@ -18,7 +19,7 @@ int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
 	unsigned int desc_count, unsigned int desc_size)
 {
 	int err;
-	char res_name[NAME_MAX];
+	char res_name[RTE_MEMZONE_NAMESIZE];
 	static int instance;
 
 	cq->index = index;
@@ -43,11 +44,11 @@ void vnic_cq_init(struct vnic_cq *cq, unsigned int flow_control_enable,
 	unsigned int color_enable, unsigned int cq_head, unsigned int cq_tail,
 	unsigned int cq_tail_color, unsigned int interrupt_enable,
 	unsigned int cq_entry_enable, unsigned int cq_message_enable,
-	unsigned int interrupt_offset, u64 cq_message_addr)
+	unsigned int interrupt_offset, uint64_t cq_message_addr)
 {
-	u64 paddr;
+	uint64_t paddr;
 
-	paddr = (u64)cq->ring.base_addr | VNIC_PADDR_TARGET;
+	paddr = (uint64_t)cq->ring.base_addr | VNIC_PADDR_TARGET;
 	writeq(paddr, &cq->ctrl->ring_base);
 	iowrite32(cq->ring.desc_count, &cq->ctrl->ring_size);
 	iowrite32(flow_control_enable, &cq->ctrl->flow_control_enable);