From dcd3c6badcd4600853d587fe288ea50d2738fc0f Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 12 May 2010 18:06:09 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/mcast_addr | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/meta b/meta index 51c66001614..8f0c0a1a1a4 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: 4322c4fd913bdb1bef39ed066a663101ef6a1104 -Head: 8deb7cadb25d9ea5be455ee15e2f3dd5a14da4d5 +Previous: 15d3aadaa3eb9af89bdaaee9846d18574f4eee32 +Head: b54fb16a892f7d1be4ff761cae768670f0a9160f Applied: af_ib: c3016259608d73bcdc527c1513bbc6e62f20b825 use_port: 766aea8efed96bf78c8929e080985acb70cce602 @@ -27,7 +27,7 @@ Applied: bind_ip: 307be975867c2451991b19c73e659d283bd76ac3 bind_addr: 45fe5aaa86f0e8699516378400fb30b785f1095d resolve_addr: 8deb7cadb25d9ea5be455ee15e2f3dd5a14da4d5 + mcast_addr: b54fb16a892f7d1be4ff761cae768670f0a9160f Unapplied: - mcast_addr: c7e828defc737eaf6a99efde2ec1b73312c558e0 set_num_paths: 4df9cc738c8d36efcf8403d0e7494b4e9360bf2f Hidden: diff --git a/patches/mcast_addr b/patches/mcast_addr index b7f6f3d4d2b..025852cb01e 100644 --- a/patches/mcast_addr +++ b/patches/mcast_addr @@ -1,5 +1,5 @@ -Bottom: d6f38b04b5440d7ba685ae5717ce4ea6bca18201 -Top: 1a50dab85510b03d2202614dc8349fe6a8a788c4 +Bottom: f8ef353d745ae3d5119a459ee3bf54e30e22e7f8 +Top: 718c7d59e7b8df4d31d80fe9f8f7c5e59164f0df Author: Sean Hefty Date: 2010-04-06 17:26:13 -0700 @@ -21,10 +21,10 @@ Signed-off-by: Sean Hefty --- diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c -index a642325..a42dd94 100644 +index 4666e5b..a64a392 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c -@@ -2934,6 +2934,8 @@ static void cma_set_mgid(struct rdma_id_private *id_priv, +@@ -2936,6 +2936,8 @@ static void cma_set_mgid(struct rdma_id_private *id_priv, 0xFF10A01B)) { /* IPv6 address is an SA assigned MGID. */ memcpy(mgid, &sin6->sin6_addr, sizeof *mgid); @@ -33,7 +33,7 @@ index a642325..a42dd94 100644 } else if ((addr->sa_family == AF_INET6)) { ipv6_ib_mc_map(&sin6->sin6_addr, dev_addr->broadcast, mc_map); if (id_priv->id.ps == RDMA_PS_UDP) -@@ -2961,9 +2963,12 @@ static int cma_join_ib_multicast(struct rdma_id_private *id_priv, +@@ -2963,9 +2965,12 @@ static int cma_join_ib_multicast(struct rdma_id_private *id_priv, if (ret) return ret; @@ -48,7 +48,7 @@ index a642325..a42dd94 100644 rdma_addr_get_sgid(dev_addr, &rec.port_gid); rec.pkey = cpu_to_be16(ib_addr_get_pkey(dev_addr)); rec.join_state = 1; -@@ -3000,6 +3005,9 @@ int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr, +@@ -3002,6 +3007,9 @@ int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr, !cma_comp(id_priv, CMA_ADDR_RESOLVED)) return -EINVAL; @@ -59,10 +59,10 @@ index a642325..a42dd94 100644 if (!mc) return -ENOMEM; diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c -index da85dee..ab0e2f9 100644 +index 89771c0..8d049f8 100644 --- a/drivers/infiniband/core/ucma.c +++ b/drivers/infiniband/core/ucma.c -@@ -1166,23 +1166,23 @@ static ssize_t ucma_notify(struct ucma_file *file, const char __user *inbuf, +@@ -1167,23 +1167,23 @@ static ssize_t ucma_notify(struct ucma_file *file, const char __user *inbuf, return ret; } @@ -93,7 +93,7 @@ index da85dee..ab0e2f9 100644 if (IS_ERR(ctx)) return PTR_ERR(ctx); -@@ -1193,14 +1193,14 @@ static ssize_t ucma_join_ip_multicast(struct ucma_file *file, +@@ -1194,14 +1194,14 @@ static ssize_t ucma_join_ip_multicast(struct ucma_file *file, goto err1; } @@ -111,7 +111,7 @@ index da85dee..ab0e2f9 100644 &resp, sizeof(resp))) { ret = -EFAULT; goto err3; -@@ -1225,6 +1225,38 @@ err1: +@@ -1226,6 +1226,38 @@ err1: return ret; } @@ -150,7 +150,7 @@ index da85dee..ab0e2f9 100644 static ssize_t ucma_leave_multicast(struct ucma_file *file, const char __user *inbuf, int in_len, int out_len) -@@ -1388,7 +1420,8 @@ static ssize_t (*ucma_cmd_table[])(struct ucma_file *file, +@@ -1389,7 +1421,8 @@ static ssize_t (*ucma_cmd_table[])(struct ucma_file *file, [RDMA_USER_CM_CMD_MIGRATE_ID] = ucma_migrate_id, [RDMA_USER_CM_CMD_QUERY] = ucma_query, [RDMA_USER_CM_CMD_BIND] = ucma_bind, -- 2.46.0