Merge branch 'akpm' (patches from Andrew)

[cascardo/linux.git] / include / rdma / rdmavt_qp.h

diff --git a/include/rdma/rdmavt_qp.h b/include/rdma/rdmavt_qp.h
index 497e590..6d23b87 100644 (file)
--- a/include/rdma/rdmavt_qp.h
+++ b/include/rdma/rdmavt_qp.h
@@ -117,8 +117,9 @@
 /*
  * Wait flags that would prevent any packet type from being sent.
  */
-#define RVT_S_ANY_WAIT_IO (RVT_S_WAIT_PIO | RVT_S_WAIT_TX | \
-       RVT_S_WAIT_DMA_DESC | RVT_S_WAIT_KMEM)
+#define RVT_S_ANY_WAIT_IO \
+       (RVT_S_WAIT_PIO | RVT_S_WAIT_PIO_DRAIN | RVT_S_WAIT_TX | \
+        RVT_S_WAIT_DMA_DESC | RVT_S_WAIT_KMEM)
 
 /*
  * Wait flags that would prevent send work requests from making progress.
@@ -210,8 +211,6 @@ struct rvt_mmap_info {
        unsigned size;
 };
 
-#define RVT_MAX_RDMA_ATOMIC    16
-
 /*
  * This structure holds the information that the send tasklet needs
  * to send a RDMA read response or atomic operation.
@@ -281,8 +280,7 @@ struct rvt_qp {
        atomic_t refcount ____cacheline_aligned_in_smp;
        wait_queue_head_t wait;
 
-       struct rvt_ack_entry s_ack_queue[RVT_MAX_RDMA_ATOMIC + 1]
-               ____cacheline_aligned_in_smp;
+       struct rvt_ack_entry *s_ack_queue;
        struct rvt_sge_state s_rdma_read_sge;
 
        spinlock_t r_lock ____cacheline_aligned_in_smp;      /* used for APM */