X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fenic%2Fbase%2Fvnic_wq.c;h=fc6dde5ae8753caecb20ab7b31e3ffa27b9d5750;hb=a001f09d11fac91b760c038cf69af7b041bc983c;hp=c3da572d7425b55ce0198c1096dab22c78734c21;hpb=846ac76c82a262069f6573387ef04ba1882deeb6;p=dpdk.git

diff --git a/drivers/net/enic/base/vnic_wq.c b/drivers/net/enic/base/vnic_wq.c
index c3da572d74..fc6dde5ae8 100644
--- a/drivers/net/enic/base/vnic_wq.c
+++ b/drivers/net/enic/base/vnic_wq.c
@@ -89,10 +89,10 @@ void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
 	unsigned int error_interrupt_enable,
 	unsigned int error_interrupt_offset)
 {
-	u64 paddr;
+	uint64_t paddr;
 	unsigned int count = wq->ring.desc_count;
 
-	paddr = (u64)wq->ring.base_addr | VNIC_PADDR_TARGET;
+	paddr = (uint64_t)wq->ring.base_addr | VNIC_PADDR_TARGET;
 	writeq(paddr, &wq->ctrl->ring_base);
 	iowrite32(count, &wq->ctrl->ring_size);
 	iowrite32(fetch_index, &wq->ctrl->fetch_index);
@@ -137,7 +137,7 @@ int vnic_wq_disable(struct vnic_wq *wq)
 	for (wait = 0; wait < 1000; wait++) {
 		if (!(ioread32(&wq->ctrl->running)))
 			return 0;
-		udelay(10);
+		usleep(10);
 	}
 
 	pr_err("Failed to disable WQ[%d]\n", wq->index);