refresh

diff --git a/meta b/meta
index 42bae2b88a60b81c2b9ebfdeca819fdee65ac31f..b12e9137b01d8190de4ffff8624238657a31c62b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 21faf4d9ada3d4c16daeaac6d30694bf05d3f9d0
-Head: 6708b270a3b3f26124984bfc6a09c5df5141a8f0
+Previous: 1f3b90234c47bb978b3b9887415b6f258e496939
+Head: 2b466e4ca997a0ee56e896ca53a6df1489686510
 Applied:
   deam: 3eb8f395f9a52f04c5b408812e743566e6d673fe
   braces: b6e7734ccc3d5e6103ae137025ec71b6bea39a63
   counters: ff3d79a44beb17d1ba7e3eb724de877ae0eeebb5
-  bld: e1350d3280457341dd720e82890fe911895cd738
-  refresh-temp: 6708b270a3b3f26124984bfc6a09c5df5141a8f0
+  bld: 2b466e4ca997a0ee56e896ca53a6df1489686510
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/bld b/patches/bld
index 3f4d9ab563ee23219784594bfe4c875cf7d3036e..bbb9211da798d189332cd6fc85595e3b15d1af98 100644 (file)
--- a/patches/bld
+++ b/patches/bld
@@ -1,5 +1,5 @@
 Bottom: ed43fb0fa39a4f3f51411e8cb67ee3b7271e74c3
-Top:    cd42f24f71f72296a1e200caad51f1dc74bc3f0b
+Top:    4d626bd014913aeb6c868bd83ce47c342b7512a2
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-29 17:28:57 -0700
 
@@ -30,7 +30,7 @@ index 23d8198..7a06161 100644
  
  #endif /* ACM_H */
 diff --git a/src/libacm.c b/src/libacm.c
-index 5331b2c..b57710a 100644
+index 5331b2c..11b88da 100644
 --- a/src/libacm.c
 +++ b/src/libacm.c
 @@ -111,7 +111,7 @@ void ib_acm_disconnect(void)
@@ -42,9 +42,12 @@ index 5331b2c..b57710a 100644
        struct ibv_path_data **paths, int *count)
  {
        struct ibv_path_data *path_data;
-@@ -129,8 +129,8 @@ static int acm_format_resp(struct acm_resolve_msg *msg,
+@@ -127,25 +127,28 @@ static int acm_format_resp(struct acm_resolve_msg *msg,
+               return -1;
+ 
        for (i = 0; i < addr_cnt; i++) {
-               switch (msg->data[i].type) {
+-              switch (msg->data[i].type) {
++              switch (msg->resolve_data[i].type) {
                case ACM_EP_INFO_PATH:
 -                      path_data[i].flags = msg->data[i].flags;
 -                      path_data[i].path  = msg->data[i].info.path;
@@ -53,9 +56,12 @@ index 5331b2c..b57710a 100644
                        (*count)++;
                        break;
                default:
-@@ -139,13 +139,16 @@ static int acm_format_resp(struct acm_resolve_msg *msg,
+-                      if (!(msg->data[i].flags & ACM_EP_FLAG_SOURCE))
++                      if (!(msg->resolve_data[i].flags & ACM_EP_FLAG_SOURCE))
+                               goto err;
  
-                       switch (msg->data[i].type) {
+-                      switch (msg->data[i].type) {
++                      switch (msg->resolve_data[i].type) {
                        case ACM_EP_INFO_ADDRESS_IP:
 -                              inet_ntop(AF_INET, msg->data[i].info.addr, addr, sizeof addr);
 +                              inet_ntop(AF_INET, msg->resolve_data[i].info.addr,

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5f0e27f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,34 +0,0 @@
-Bottom: cd42f24f71f72296a1e200caad51f1dc74bc3f0b
-Top:    4d626bd014913aeb6c868bd83ce47c342b7512a2
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-06-29 17:38:40 -0700
-
-Refresh of bld
-
----
-
-diff --git a/src/libacm.c b/src/libacm.c
-index b57710a..11b88da 100644
---- a/src/libacm.c
-+++ b/src/libacm.c
-@@ -127,17 +127,17 @@ static int acm_format_resp(struct acm_msg *msg,
-               return -1;
- 
-       for (i = 0; i < addr_cnt; i++) {
--              switch (msg->data[i].type) {
-+              switch (msg->resolve_data[i].type) {
-               case ACM_EP_INFO_PATH:
-                       path_data[i].flags = msg->resolve_data[i].flags;
-                       path_data[i].path  = msg->resolve_data[i].info.path;
-                       (*count)++;
-                       break;
-               default:
--                      if (!(msg->data[i].flags & ACM_EP_FLAG_SOURCE))
-+                      if (!(msg->resolve_data[i].flags & ACM_EP_FLAG_SOURCE))
-                               goto err;
- 
--                      switch (msg->data[i].type) {
-+                      switch (msg->resolve_data[i].type) {
-                       case ACM_EP_INFO_ADDRESS_IP:
-                               inet_ntop(AF_INET, msg->resolve_data[i].info.addr,
-                                       addr, sizeof addr);