pop (CONFLICT)

diff --git a/meta b/meta
index 3b6a85a075665a70ced3379606d1b9e12acb6e78..679f6de504d263cbac4901b213568f27968cdf92 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: 52f0f882b5f20526206984e534224b481b179615
+Previous: 034123185157d0adbfd419f925d888c7b8bbdce9
 Head: 4fc1991fa0247d496e51fb34f2d7bc3977205cf7
 Applied:
+  af-ib-conn: 4fc1991fa0247d496e51fb34f2d7bc3977205cf7
 Unapplied:
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9
   rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f
-  af-ib-conn: 70cdbcec6986d1fcc8146a73cf2d8b6a537e71f5
   addrtype: fffb812c9cbe707f830d1e7e713feb3ae3e2e8ec
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   old-rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/af-ib-conn b/patches/af-ib-conn
index 0f903eb101740fd089acdb33aacabc9234638402..a63021c7b832a68365088c0f89a6f5de5496a2e8 100644 (file)
--- a/patches/af-ib-conn
+++ b/patches/af-ib-conn
@@ -1,5 +1,5 @@
-Bottom: 7a63e115cc4adf073292cd3edca568d9910e1a6e
-Top:    5d9e0a431c854e5d6730391b6ffd28b9fd9c1da0
+Bottom: 1d1da945e49647331f04f82a45cc353e9541a6ae
+Top:    1d1da945e49647331f04f82a45cc353e9541a6ae
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-21 15:38:15 -0700
 
@@ -14,126 +14,4 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-diff --git a/include/rdma/rdma_cma.h b/include/rdma/rdma_cma.h
-index 4c4a057..70f7f6b 100755
---- a/include/rdma/rdma_cma.h
-+++ b/include/rdma/rdma_cma.h
-@@ -38,6 +38,7 @@
- #include <sys/socket.h>
- #include <infiniband/verbs.h>
- #include <infiniband/sa.h>
-+#include <infiniband/ib.h>
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -96,12 +97,14 @@ struct rdma_addr {
-               struct sockaddr         src_addr;
-               struct sockaddr_in      src_sin;
-               struct sockaddr_in6     src_sin6;
-+              struct sockaddr_ib      src_ib;
-               struct sockaddr_storage src_storage;
-       };
-       union {
-               struct sockaddr         dst_addr;
-               struct sockaddr_in      dst_sin;
-               struct sockaddr_in6     dst_sin6;
-+              struct sockaddr_ib      dst_ib;
-               struct sockaddr_storage dst_storage;
-       };
-       union {
-diff --git a/src/acm.c b/src/acm.c
-index 3d8c912..4b17043 100755
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -64,18 +64,6 @@ static pthread_mutex_t acm_lock = PTHREAD_MUTEX_INITIALIZER;
- static int sock = -1;
- static short server_port = 6125;
- 
--struct ib_connect_hdr {
--      uint8_t  cma_version;
--      uint8_t  ip_version; /* IP version: 7:4 */
--      uint16_t port;
--      uint32_t src_addr[4];
--      uint32_t dst_addr[4];
--#define cma_src_ip4 src_addr[3]
--#define cma_src_ip6 src_addr[0]
--#define cma_dst_ip4 dst_addr[3]
--#define cma_dst_ip6 dst_addr[0]
--};
--
- static void ucma_set_server_port(void)
- {
-       FILE *f;
-@@ -167,9 +155,6 @@ static int ucma_ib_set_connect(struct rdma_addrinfo *ib_rai,
- {
-       struct ib_connect_hdr *hdr;
- 
--      if (rai->ai_family == AF_IB)
--              return 0;
--
-       hdr = calloc(1, sizeof *hdr);
-       if (!hdr)
-               return ERR(ENOMEM);
-@@ -180,12 +165,21 @@ static int ucma_ib_set_connect(struct rdma_addrinfo *ib_rai,
-                      &((struct sockaddr_in *) rai->ai_src_addr)->sin_addr, 4);
-               memcpy(&hdr->cma_dst_ip4,
-                      &((struct sockaddr_in *) rai->ai_dst_addr)->sin_addr, 4);
--      } else {
-+      } else if (rai->ai_family == AF_INET6) {
-               hdr->ip_version = 6 << 4;
-               memcpy(&hdr->cma_src_ip6,
-                      &((struct sockaddr_in6 *) rai->ai_src_addr)->sin6_addr, 16);
-               memcpy(&hdr->cma_dst_ip6,
-                      &((struct sockaddr_in6 *) rai->ai_dst_addr)->sin6_addr, 16);
-+      } else if (rai->ai_family == AF_IB) {
-+              hdr->ip_version = 6 << 4;
-+              memcpy(&hdr->cma_src_ip6,
-+                     &((struct sockaddr_ib *) rai->ai_src_addr)->sib_addr, 16);
-+              memcpy(&hdr->cma_dst_ip6,
-+                     &((struct sockaddr_ib *) rai->ai_dst_addr)->sib_addr, 16);
-+      } else {
-+              free(hdr);
-+              return ERR(EINVAL);
-       }
- 
-       ib_rai->ai_connect = hdr;
-diff --git a/src/cma.c b/src/cma.c
-index 91bf108..1888c99 100755
---- a/src/cma.c
-+++ b/src/cma.c
-@@ -1290,6 +1290,12 @@ static void ucma_copy_conn_param_to_kern(struct cma_id_private *id_priv,
-       if (id_priv->connect_len) {
-               memcpy(dst->private_data, id_priv->connect, id_priv->connect_len);
-               dst->private_data_len = id_priv->connect_len;
-+      } else if (id_priv->id.route.addr.src_addr.sa_family == AF_IB) {
-+              struct ib_connect_hdr *hdr = (struct ib_connect_hdr *) dst->private_data;
-+              hdr->ip_version = 6 << 4;
-+              memcpy(&hdr->cma_src_ip6, &id_priv->id.route.addr.src_ib.sib_addr, 16);
-+              memcpy(&hdr->cma_dst_ip6, &id_priv->id.route.addr.dst_ib.sib_addr, 16);
-+              dst->private_data_len = sizeof(*hdr);
-       }
- 
-       if (src) {
-diff --git a/src/cma.h b/src/cma.h
-index 6a1cd75..5a38679 100644
---- a/src/cma.h
-+++ b/src/cma.h
-@@ -162,6 +162,18 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints);
- #define ucma_ib_resolve(x, y)
- #endif
- 
-+struct ib_connect_hdr {
-+      uint8_t  cma_version;
-+      uint8_t  ip_version; /* IP version: 7:4 */
-+      uint16_t port;
-+      uint32_t src_addr[4];
-+      uint32_t dst_addr[4];
-+#define cma_src_ip4 src_addr[3]
-+#define cma_src_ip6 src_addr[0]
-+#define cma_dst_ip4 dst_addr[3]
-+#define cma_dst_ip6 dst_addr[0]
-+};
-+
- /* Define path record definition if using older version of libibverbs */
- #ifdef DEFINE_PATH_RECORD
- #define IBV_PATH_RECORD_REVERSIBLE 0x80
+