Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / drivers / net / enic / vnic_wq.c

diff --git a/drivers/net/enic/vnic_wq.c b/drivers/net/enic/vnic_wq.c
index d5f984357f5cb2437a3a48172e75bcaf93f77db1..1378afbdfe67b150ee172f6216f4af13fbd5c2ae 100644 (file)
--- a/drivers/net/enic/vnic_wq.c
+++ b/drivers/net/enic/vnic_wq.c
@@ -161,10 +161,10 @@ int vnic_wq_disable(struct vnic_wq *wq)
        iowrite32(0, &wq->ctrl->enable);
 
        /* Wait for HW to ACK disable request */
-       for (wait = 0; wait < 100; wait++) {
+       for (wait = 0; wait < 1000; wait++) {
                if (!(ioread32(&wq->ctrl->running)))
                        return 0;
-               udelay(1);
+               udelay(10);
        }
 
        printk(KERN_ERR "Failed to disable WQ[%d]\n", wq->index);