diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-09 14:53:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-09 14:53:06 -0400 |
| commit | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (patch) | |
| tree | 83855363f7be25305477dca09a91166deb376354 /drivers/infiniband/core/cma.c | |
| parent | f16393776fc133d95fe3b3ba7118df579ed90af5 (diff) | |
| parent | 5091b353883ba3358998797efb284f82344531f3 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/mlx4: Check correct variable for allocation failure
RDMA/nes: Correct cap.max_inline_data assignment in nes_query_qp()
RDMA/cm: Set num_paths when manually assigning path records
IB/cm: Fix device_create() return value check
Diffstat (limited to 'drivers/infiniband/core/cma.c')
| -rw-r--r-- | drivers/infiniband/core/cma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 7794249430ca..6d777069d86d 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c | |||
| @@ -1684,6 +1684,7 @@ int rdma_set_ib_paths(struct rdma_cm_id *id, | |||
| 1684 | } | 1684 | } |
| 1685 | 1685 | ||
| 1686 | memcpy(id->route.path_rec, path_rec, sizeof *path_rec * num_paths); | 1686 | memcpy(id->route.path_rec, path_rec, sizeof *path_rec * num_paths); |
| 1687 | id->route.num_paths = num_paths; | ||
| 1687 | return 0; | 1688 | return 0; |
| 1688 | err: | 1689 | err: |
| 1689 | cma_comp_exch(id_priv, CMA_ROUTE_RESOLVED, CMA_ADDR_RESOLVED); | 1690 | cma_comp_exch(id_priv, CMA_ROUTE_RESOLVED, CMA_ADDR_RESOLVED); |