From ada95643b3384b2ec972e41d04223387615a195e Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 12 May 2010 18:02:11 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/ip_addr_size | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta b/meta index eafde0c54ef..2a930c844dd 100644 --- a/meta +++ b/meta @@ -1,12 +1,12 @@ Version: 1 -Previous: a70bd258d441a7f27d706baa106f2a5360347809 -Head: 019f257dc026a7052e50bed3815f4fe86f631a3d +Previous: 071129d5c09a0f15d94d27b8cb2b5b38e6239c9d +Head: d8bbc97d9347bbecf5471550b8a08bf926a2a614 Applied: af_ib: c3016259608d73bcdc527c1513bbc6e62f20b825 use_port: 766aea8efed96bf78c8929e080985acb70cce602 cma_af_ib_checks: 019f257dc026a7052e50bed3815f4fe86f631a3d + ip_addr_size: d8bbc97d9347bbecf5471550b8a08bf926a2a614 Unapplied: - ip_addr_size: 81676845f1805bee438ce9e7ddcf23996b52c67f cma_bind_port: c63b2aea28d9f5dbbee5213c60bfa0ea25d37794 qp_type: a436162865fb3b2fab6837cff1bb018747cb34c8 ucma_create_ps_ib: ed97b7f9aeb971f470024ffc2d6c52593a410110 diff --git a/patches/ip_addr_size b/patches/ip_addr_size index a0ffd149052..2a44e7a562d 100644 --- a/patches/ip_addr_size +++ b/patches/ip_addr_size @@ -1,5 +1,5 @@ -Bottom: 889f3aa80f9d0981f60c462a6d20d35867f0565d -Top: d4640c88c25de2c2a3277f90fee72af33977e2a6 +Bottom: 01276437a0503b2abe76181fba355ceaf4f607f5 +Top: 586764ae6c56733377b56a1a9acfb79e10d6ce76 Author: Sean Hefty Date: 2010-03-17 10:10:23 -0800 @@ -16,10 +16,10 @@ Signed-off-by: Sean Hefty --- diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c -index abbb069..f73c5de 100644 +index 0b926e4..7fac299 100644 --- a/drivers/infiniband/core/addr.c +++ b/drivers/infiniband/core/addr.c -@@ -43,6 +43,7 @@ +@@ -44,6 +44,7 @@ #include #include #include @@ -27,7 +27,7 @@ index abbb069..f73c5de 100644 MODULE_AUTHOR("Sean Hefty"); MODULE_DESCRIPTION("IB Address Translation"); -@@ -68,6 +69,21 @@ static LIST_HEAD(req_list); +@@ -69,6 +70,21 @@ static LIST_HEAD(req_list); static DECLARE_DELAYED_WORK(work, process_req); static struct workqueue_struct *addr_wq; @@ -49,7 +49,7 @@ index abbb069..f73c5de 100644 void rdma_addr_register_client(struct rdma_addr_client *client) { atomic_set(&client->refcount, 1); -@@ -366,12 +382,12 @@ int rdma_resolve_ip(struct rdma_addr_client *client, +@@ -367,12 +383,12 @@ int rdma_resolve_ip(struct rdma_addr_client *client, goto err; } @@ -65,10 +65,10 @@ index abbb069..f73c5de 100644 req->callback = callback; req->context = context; diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c -index 6460fbf..ac57155 100644 +index 2159793..27dfa47 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c -@@ -1468,7 +1468,7 @@ static void cma_listen_on_dev(struct rdma_id_private *id_priv, +@@ -1469,7 +1469,7 @@ static void cma_listen_on_dev(struct rdma_id_private *id_priv, dev_id_priv->state = CMA_ADDR_BOUND; memcpy(&id->route.addr.src_addr, &id_priv->id.route.addr.src_addr, @@ -77,7 +77,7 @@ index 6460fbf..ac57155 100644 cma_attach_to_dev(dev_id_priv, cma_dev); list_add_tail(&dev_id_priv->listen_list, &id_priv->listen_list); -@@ -1834,7 +1834,7 @@ static void addr_handler(int status, struct sockaddr *src_addr, +@@ -1836,7 +1836,7 @@ static void addr_handler(int status, struct sockaddr *src_addr, event.status = status; } else { memcpy(&id_priv->id.route.addr.src_addr, src_addr, @@ -86,7 +86,7 @@ index 6460fbf..ac57155 100644 event.event = RDMA_CM_EVENT_ADDR_RESOLVED; } -@@ -1924,7 +1924,7 @@ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr, +@@ -1926,7 +1926,7 @@ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr, return -EINVAL; atomic_inc(&id_priv->refcount); @@ -95,7 +95,7 @@ index 6460fbf..ac57155 100644 if (cma_any_addr(dst_addr)) ret = cma_resolve_loopback(id_priv); else -@@ -2147,7 +2147,7 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr) +@@ -2149,7 +2149,7 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr) goto err1; } @@ -104,7 +104,7 @@ index 6460fbf..ac57155 100644 ret = cma_get_port(id_priv); if (ret) goto err2; -@@ -2807,7 +2807,7 @@ int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr, +@@ -2809,7 +2809,7 @@ int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr, if (!mc) return -ENOMEM; @@ -113,7 +113,7 @@ index 6460fbf..ac57155 100644 mc->context = context; mc->id_priv = id_priv; -@@ -2842,7 +2842,7 @@ void rdma_leave_multicast(struct rdma_cm_id *id, struct sockaddr *addr) +@@ -2844,7 +2844,7 @@ void rdma_leave_multicast(struct rdma_cm_id *id, struct sockaddr *addr) id_priv = container_of(id, struct rdma_id_private, id); spin_lock_irq(&id_priv->lock); list_for_each_entry(mc, &id_priv->mc_list, list) { -- 2.41.0