diff options
author | 2012-06-24 04:59:59 -0700 | |
---|---|---|
committer | 2012-06-24 04:59:59 -0700 | |
commit | 2e51fd3c13e330d9364a211ddcd3e38771eeb4b4 (patch) | |
tree | f74fe4bd4a80fe85f5c2150ea5e5d0191a6403d1 /drivers/infiniband/hw/ocrdma/ocrdma.h | |
parent | RDMA/cma: QP type check on received REQs should be AND not OR (diff) | |
parent | RDMA/ocrdma: Fix off by one in ocrdma_query_gid() (diff) | |
download | linux-dev-2e51fd3c13e330d9364a211ddcd3e38771eeb4b4.tar.xz linux-dev-2e51fd3c13e330d9364a211ddcd3e38771eeb4b4.zip |
Merge branches 'cma' and 'ocrdma' into for-linus
Diffstat (limited to 'drivers/infiniband/hw/ocrdma/ocrdma.h')
-rw-r--r-- | drivers/infiniband/hw/ocrdma/ocrdma.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/ocrdma/ocrdma.h index 037f5cea85bd..48970af23679 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma.h +++ b/drivers/infiniband/hw/ocrdma/ocrdma.h @@ -61,6 +61,7 @@ struct ocrdma_dev_attr { u32 max_inline_data; int max_send_sge; int max_recv_sge; + int max_srq_sge; int max_mr; u64 max_mr_size; u32 max_num_mr_pbl; |