refresh

diff --git a/meta b/meta
index 5456a4343bc15aa8013f67e94f88506782bacab0..770d390f834677cd3d3d69d5482957f591df7eae 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 3985f8506ac85038e6493b11f5beb2d28a902a3a
-Head: 4a597eabbed60ba5db504c8286becbf56fd29c1d
+Previous: e82b55a5329204a9ae2876c69202f6a9b668cea2
+Head: 2da01e919b3733193b87e29a8292bef2ffa17ea8
 Applied:
   rst-afib: 8c8076b8893f5967b3d23da0f7ee6c093902ef3d
-  ex-afib: 8ba5373d88f8f88c450c77db10012f666b02361d
-  refresh-temp: 4a597eabbed60ba5db504c8286becbf56fd29c1d
+  ex-afib: 2da01e919b3733193b87e29a8292bef2ffa17ea8
 Unapplied:
   rs-setroute: 70a6b0b2fce4adbe0ff7d7551074a87d43cac9a2
   old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3

diff --git a/patches/ex-afib b/patches/ex-afib
index e4c89235ba18af4518ffa77fe29dca878ad7d12e..e194ea897ff70bf567c1da4f972e57259beab5bd 100644 (file)
--- a/patches/ex-afib
+++ b/patches/ex-afib
@@ -1,5 +1,5 @@
 Bottom: 3dc2d85df261635ce775f5736dbd30738699fc9a
-Top:    0a2296f2e8de80e0e20e79733d71b3a52065d2bd
+Top:    8d61e72c859eba882a3f2d5c5b34ca2f73d66d06
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-07-20 19:22:55 -0700
 
@@ -160,7 +160,7 @@ index a408b9e..9c84a6b 100644
                        printf("\t[-I iterations]\n");
                        printf("\t[-C transfer_count]\n");
 diff --git a/examples/udaddy.c b/examples/udaddy.c
-index 7360d60..e49c93b 100644
+index 7360d60..031b0b6 100644
 --- a/examples/udaddy.c
 +++ b/examples/udaddy.c
 @@ -77,7 +77,7 @@ static uint8_t set_tos = 0;
@@ -172,6 +172,15 @@ index 7360d60..e49c93b 100644
  
  static int create_message(struct cmatest_node *node)
  {
+@@ -429,7 +429,7 @@ static int alloc_nodes(void)
+               if (dst_addr) {
+                       ret = rdma_create_id(test.channel,
+                                            &test.nodes[i].cma_id,
+-                                           &test.nodes[i], port_space);
++                                           &test.nodes[i], hints.ai_port_space);
+                       if (ret)
+                               goto err;
+               }
 @@ -505,19 +505,15 @@ static int connect_events(void)
  static int run_server(void)
  {
@@ -239,7 +248,7 @@ index 7360d60..e49c93b 100644
 +              case 'P':
 +                      if (!strncasecmp("ib", optarg, 2)) {
 +                              hints.ai_port_space = RDMA_PS_IB;
-+                      } else if (!stncasecmp("ipoib", optarg, 5)) {
++                      } else if (!strncasecmp("ipoib", optarg, 5)) {
 +                              hints.ai_port_space = RDMA_PS_IPOIB;
 +                      } else if (strncasecmp("udp", optarg, 3)) {
 +                              fprintf(stderr, "Warning: unknown port space format\n");

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index edd7465..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: 0a2296f2e8de80e0e20e79733d71b3a52065d2bd
-Top:    8d61e72c859eba882a3f2d5c5b34ca2f73d66d06
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-07-20 21:25:04 -0700
-
-Refresh of ex-afib
-
----
-
-diff --git a/examples/udaddy.c b/examples/udaddy.c
-index e49c93b..031b0b6 100644
---- a/examples/udaddy.c
-+++ b/examples/udaddy.c
-@@ -429,7 +429,7 @@ static int alloc_nodes(void)
-               if (dst_addr) {
-                       ret = rdma_create_id(test.channel,
-                                            &test.nodes[i].cma_id,
--                                           &test.nodes[i], port_space);
-+                                           &test.nodes[i], hints.ai_port_space);
-                       if (ret)
-                               goto err;
-               }
-@@ -644,7 +644,7 @@ int main(int argc, char **argv)
-               case 'P':
-                       if (!strncasecmp("ib", optarg, 2)) {
-                               hints.ai_port_space = RDMA_PS_IB;
--                      } else if (!stncasecmp("ipoib", optarg, 5)) {
-+                      } else if (!strncasecmp("ipoib", optarg, 5)) {
-                               hints.ai_port_space = RDMA_PS_IPOIB;
-                       } else if (strncasecmp("udp", optarg, 3)) {
-                               fprintf(stderr, "Warning: unknown port space format\n");