diff options
author | Mike Marciniszyn <mike.marciniszyn@intel.com> | 2015-01-16 10:52:18 -0500 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2015-02-20 09:04:09 -0800 |
commit | a46a2802f7470045714e8086d88a8b966b0753c3 (patch) | |
tree | 44b827ad27fd01f6442a89e667c32dc2a6503d1f /drivers/infiniband/hw/qib/qib_user_sdma.c | |
parent | 041af0bb765a5fd3a9206352ed9ec510a554f886 (diff) | |
download | talos-op-linux-a46a2802f7470045714e8086d88a8b966b0753c3.tar.gz talos-op-linux-a46a2802f7470045714e8086d88a8b966b0753c3.zip |
IB/qib: Fix checkpatch warnings
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_user_sdma.c')
-rw-r--r-- | drivers/infiniband/hw/qib/qib_user_sdma.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/qib/qib_user_sdma.c b/drivers/infiniband/hw/qib/qib_user_sdma.c index d2806cae234c..a2b8236e2864 100644 --- a/drivers/infiniband/hw/qib/qib_user_sdma.c +++ b/drivers/infiniband/hw/qib/qib_user_sdma.c @@ -50,7 +50,7 @@ /* expected size of headers (for dma_pool) */ #define QIB_USER_SDMA_EXP_HEADER_LENGTH 64 /* attempt to drain the queue for 5secs */ -#define QIB_USER_SDMA_DRAIN_TIMEOUT 500 +#define QIB_USER_SDMA_DRAIN_TIMEOUT 250 /* * track how many times a process open this driver. @@ -1142,7 +1142,7 @@ void qib_user_sdma_queue_drain(struct qib_pportdata *ppd, qib_user_sdma_hwqueue_clean(ppd); qib_user_sdma_queue_clean(ppd, pq); mutex_unlock(&pq->lock); - msleep(10); + msleep(20); } if (pq->num_pending || pq->num_sending) { @@ -1316,8 +1316,6 @@ retry: if (nfree && !list_empty(pktlist)) goto retry; - - return; } /* pq->lock must be held, get packets on the wire... */ |