refresh

diff --git a/meta b/meta
index 7b081d624b177976abf384c08aaf0b53fe3d6ce8..473a43e888c19cea4cca9dfc331acefd010ffe97 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: a3b9e3129d91e584870ef5cc86804e53d42bb304
-Head: 936db01fb459e148352d87fd5984f60084cfda1e
+Previous: 482d0e3616cef521cb65eb1c5afbe8134d23ae3e
+Head: 890853ba658370faaeb7621362228e90f036bb17
 Applied:
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
   rs-nodelay: c7515656281368210d75c103cc68c131511debf6
@@ -9,7 +9,6 @@ Applied:
   rs-async-nonblock: 8cea41290e9c701beaa780fd2f412060916ca269
   rs-group-tests: f484de0b80b9369ad12c6b5628bb49a51dfc4ef0
   rs-fulltest: a91cd18a4f7c5b6b5f7483f78e6d3916f66ef46f
-  old-acm: 3abd0dd6089c61bf0350b6a2b7d0aa37024a0de3
-  refresh-temp: 936db01fb459e148352d87fd5984f60084cfda1e
+  old-acm: 890853ba658370faaeb7621362228e90f036bb17
 Unapplied:
 Hidden:

diff --git a/patches/old-acm b/patches/old-acm
index f4e678fe2c03cbf897a8c9c3527b1cf4b604da1a..ba6393efb7e0c7d7dacea62b7c0d011e31d0d557 100644 (file)
--- a/patches/old-acm
+++ b/patches/old-acm
@@ -1,5 +1,5 @@
 Bottom: a069666dc428f246f9dc954bdb50553367794189
-Top:    a069666dc428f246f9dc954bdb50553367794189
+Top:    f88edc44196caddaa1a1e236d26ce27c4aab8166
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-18 10:00:58 -0700
 
@@ -15,4 +15,59 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/configure.in b/configure.in
+index fa90fcb..dec6064 100644
+--- a/configure.in
++++ b/configure.in
+@@ -73,6 +73,11 @@ fi
+ AC_CHECK_HEADER(infiniband/acm.h, 
+       AC_DEFINE([USE_IB_ACM], 1, [setting IBACM support]), [])
+ 
++AC_CHECK_HEADER(infiniband/acm.h,
++      AC_CHECK_MEMBER(struct acm_msg.resolve_data, [],
++              AC_DEFINE(DEFINE_ACM_MSG, 1, [adding ACM message definition]),
++                      [#include <infiniband/acm.h>]), [])
++
+ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
+     if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then
+         ac_cv_version_script=yes
+diff --git a/src/acm.c b/src/acm.c
+index 7911b41..bcf11da 100755
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -48,6 +48,18 @@
+ #ifdef USE_IB_ACM
+ #include <infiniband/acm.h>
+ 
++#if DEFINE_ACM_MSG
++typedef struct cma_acm_msg {
++      struct acm_hdr                  hdr;
++      union{
++              uint8_t                 data[ACM_MSG_DATA_LENGTH];
++              struct acm_ep_addr_data resolve_data[0];
++      };
++} cma_acm_msg_t;
++#else
++typedef struct acm_msg cma_acm_msg_t;
++#endif
++
+ static pthread_mutex_t acm_lock = PTHREAD_MUTEX_INITIALIZER;
+ static int sock;
+ static short server_port = 6125;
+@@ -237,7 +249,7 @@ err:
+       rdma_freeaddrinfo(ib_rai);
+ }
+ 
+-static void ucma_ib_save_resp(struct rdma_addrinfo *rai, struct acm_msg *msg)
++static void ucma_ib_save_resp(struct rdma_addrinfo *rai, cma_acm_msg_t *msg)
+ {
+       struct acm_ep_addr_data *ep_data;
+       struct ibv_path_data *path_data = NULL;
+@@ -306,7 +318,7 @@ static void ucma_copy_rai_addr(struct acm_ep_addr_data *data, struct sockaddr *a
+ 
+ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints)
+ {
+-      struct acm_msg msg;
++      cma_acm_msg_t msg;
+       struct acm_ep_addr_data *data;
+       int ret;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index eef8dc9..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,65 +0,0 @@
-Bottom: a069666dc428f246f9dc954bdb50553367794189
-Top:    f88edc44196caddaa1a1e236d26ce27c4aab8166
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-18 10:35:55 -0700
-
-Refresh of old-acm
-
----
-
-diff --git a/configure.in b/configure.in
-index fa90fcb..dec6064 100644
---- a/configure.in
-+++ b/configure.in
-@@ -73,6 +73,11 @@ fi
- AC_CHECK_HEADER(infiniband/acm.h, 
-       AC_DEFINE([USE_IB_ACM], 1, [setting IBACM support]), [])
- 
-+AC_CHECK_HEADER(infiniband/acm.h,
-+      AC_CHECK_MEMBER(struct acm_msg.resolve_data, [],
-+              AC_DEFINE(DEFINE_ACM_MSG, 1, [adding ACM message definition]),
-+                      [#include <infiniband/acm.h>]), [])
-+
- AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
-     if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then
-         ac_cv_version_script=yes
-diff --git a/src/acm.c b/src/acm.c
-index 7911b41..bcf11da 100755
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -48,6 +48,18 @@
- #ifdef USE_IB_ACM
- #include <infiniband/acm.h>
- 
-+#if DEFINE_ACM_MSG
-+typedef struct cma_acm_msg {
-+      struct acm_hdr                  hdr;
-+      union{
-+              uint8_t                 data[ACM_MSG_DATA_LENGTH];
-+              struct acm_ep_addr_data resolve_data[0];
-+      };
-+} cma_acm_msg_t;
-+#else
-+typedef struct acm_msg cma_acm_msg_t;
-+#endif
-+
- static pthread_mutex_t acm_lock = PTHREAD_MUTEX_INITIALIZER;
- static int sock;
- static short server_port = 6125;
-@@ -237,7 +249,7 @@ err:
-       rdma_freeaddrinfo(ib_rai);
- }
- 
--static void ucma_ib_save_resp(struct rdma_addrinfo *rai, struct acm_msg *msg)
-+static void ucma_ib_save_resp(struct rdma_addrinfo *rai, cma_acm_msg_t *msg)
- {
-       struct acm_ep_addr_data *ep_data;
-       struct ibv_path_data *path_data = NULL;
-@@ -306,7 +318,7 @@ static void ucma_copy_rai_addr(struct acm_ep_addr_data *data, struct sockaddr *a
- 
- void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints)
- {
--      struct acm_msg msg;
-+      cma_acm_msg_t msg;
-       struct acm_ep_addr_data *data;
-       int ret;