X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=inline;f=drivers%2Fnet%2Fenic%2Fbase%2Fvnic_rq.c;h=1af96a94139bf201eccb13c1f989cb96a329299d;hb=04e8ec74192ae4bc537e4854410551255bf85cf5;hp=3956d4f73fdadaa9c9f05cdb813cc84bac92be71;hpb=846ac76c82a262069f6573387ef04ba1882deeb6;p=dpdk.git

diff --git a/drivers/net/enic/base/vnic_rq.c b/drivers/net/enic/base/vnic_rq.c
index 3956d4f73f..1af96a9413 100644
--- a/drivers/net/enic/base/vnic_rq.c
+++ b/drivers/net/enic/base/vnic_rq.c
@@ -47,10 +47,10 @@ void vnic_rq_init_start(struct vnic_rq *rq, unsigned int cq_index,
 	unsigned int error_interrupt_enable,
 	unsigned int error_interrupt_offset)
 {
-	u64 paddr;
+	uint64_t paddr;
 	unsigned int count = rq->ring.desc_count;
 
-	paddr = (u64)rq->ring.base_addr | VNIC_PADDR_TARGET;
+	paddr = (uint64_t)rq->ring.base_addr | VNIC_PADDR_TARGET;
 	writeq(paddr, &rq->ctrl->ring_base);
 	iowrite32(count, &rq->ctrl->ring_size);
 	iowrite32(cq_index, &rq->ctrl->cq_index);
@@ -70,7 +70,7 @@ void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_index,
 	unsigned int error_interrupt_enable,
 	unsigned int error_interrupt_offset)
 {
-	u32 fetch_index = 0;
+	uint32_t fetch_index = 0;
 
 	/* Use current fetch_index as the ring starting point */
 	fetch_index = ioread32(&rq->ctrl->fetch_index);
@@ -110,7 +110,7 @@ int vnic_rq_disable(struct vnic_rq *rq)
 	for (wait = 0; wait < 1000; wait++) {
 		if (!(ioread32(&rq->ctrl->running)))
 			return 0;
-		udelay(10);
+		usleep(10);
 	}
 
 	pr_err("Failed to disable RQ[%d]\n", rq->index);
@@ -122,7 +122,7 @@ void vnic_rq_clean(struct vnic_rq *rq,
 	void (*buf_clean)(struct rte_mbuf **buf))
 {
 	struct rte_mbuf **buf;
-	u32 fetch_index, i;
+	uint32_t fetch_index, i;
 	unsigned int count = rq->ring.desc_count;
 
 	buf = &rq->mbuf_ring[0];