From bddf7f8cb9868b1a5110695057c2797dcc7009c3 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 12 May 2010 18:06:17 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/set_num_paths | 17 +++-------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/meta b/meta index 8f0c0a1a1a4..ab6c173fc03 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: 15d3aadaa3eb9af89bdaaee9846d18574f4eee32 -Head: b54fb16a892f7d1be4ff761cae768670f0a9160f +Previous: 09f3752eb7b22fce7a144d92b72d6fafe9213ed1 +Head: 29a17547bc1a0c1843c88b202d317e6c91d449c5 Applied: af_ib: c3016259608d73bcdc527c1513bbc6e62f20b825 use_port: 766aea8efed96bf78c8929e080985acb70cce602 @@ -28,6 +28,6 @@ Applied: bind_addr: 45fe5aaa86f0e8699516378400fb30b785f1095d resolve_addr: 8deb7cadb25d9ea5be455ee15e2f3dd5a14da4d5 mcast_addr: b54fb16a892f7d1be4ff761cae768670f0a9160f + set_num_paths: 29a17547bc1a0c1843c88b202d317e6c91d449c5 Unapplied: - set_num_paths: 4df9cc738c8d36efcf8403d0e7494b4e9360bf2f Hidden: diff --git a/patches/set_num_paths b/patches/set_num_paths index 1a593962b7e..a647535ccd2 100644 --- a/patches/set_num_paths +++ b/patches/set_num_paths @@ -1,5 +1,5 @@ -Bottom: 1a50dab85510b03d2202614dc8349fe6a8a788c4 -Top: fbf79fc72cd2d3b03a3eac8f5e52ad3235dbecae +Bottom: 718c7d59e7b8df4d31d80fe9f8f7c5e59164f0df +Top: 718c7d59e7b8df4d31d80fe9f8f7c5e59164f0df Author: Sean Hefty Date: 2010-04-06 17:26:25 -0700 @@ -19,15 +19,4 @@ Signed-off-by: Sean Hefty --- -diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c -index a42dd94..ce587b6 100644 ---- a/drivers/infiniband/core/cma.c -+++ b/drivers/infiniband/core/cma.c -@@ -1791,6 +1791,7 @@ int rdma_set_ib_paths(struct rdma_cm_id *id, - } - - memcpy(id->route.path_rec, path_rec, sizeof *path_rec * num_paths); -+ id->route.num_paths = num_paths; - return 0; - err: - cma_comp_exch(id_priv, CMA_ROUTE_RESOLVED, CMA_ADDR_RESOLVED); + -- 2.46.0