refresh

diff --git a/meta b/meta
index 0334a55ad70eec57f1ddbb0a1cbf249feb7e5bfc..edab4777dfbb73c06c607d2aea254afd4e5fc0fd 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 301ccbe346dbd5e2c91dbdf7fdd46272abfe1267
-Head: fe6ada6a0f792cadb00e423f5f28059d30999a5b
+Previous: bedcd167143067d2ae261f997d0e159ec0e0fa46
+Head: 0cf4f29bd1e196166130c11661634c7cd1147468
 Applied:
   sync: 452ce3b051e10e10363baa77834962a89267e052
   pre-af-ib: 73504ef1f812bea6d1fd59f194f90e5194ca2efa
@@ -12,8 +12,7 @@ Applied:
   getreq: 1ef2ab06b60a1192a1b2af253d75e187ecc68381
   ep: 47348de149bd19aa0f7d1ee293e5c2157c181c26
   samples: 69798ede2a2f96a442fe907f87df6017f58ca998
-  startup: e0b0e0d7b78f9b3292d4fe602c1fce7af20d742d
-  refresh-temp: fe6ada6a0f792cadb00e423f5f28059d30999a5b
+  startup: 0cf4f29bd1e196166130c11661634c7cd1147468
 Unapplied:
   cq-status: d4535a68c8d41302c9ee9d44b98a75ea19b4f172
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ff39af8..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,55 +0,0 @@
-Bottom: 38c2985a44cf7bf6c9797cc313edebe2f3e7ddd7
-Top:    b2c734b11bd0f2946023e6ac06ccc9f4117f0a30
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-16 15:50:02 -0700
-
-Refresh of startup
-
----
-
-diff --git a/trunk/ulp/librdmacm/src/addrinfo.cpp b/trunk/ulp/librdmacm/src/addrinfo.cpp
-index 26a465a..5d53ca6 100644
---- a/trunk/ulp/librdmacm/src/addrinfo.cpp
-+++ b/trunk/ulp/librdmacm/src/addrinfo.cpp
-@@ -36,7 +36,6 @@
- \r
- #include <windows.h>\r
- #include <winsock2.h>\r
--#include <stdio.h>\r
- \r
- #include "cma.h"\r
- #include <rdma/rdma_cma.h>\r
-diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
-index 46ec273..835d020 100644
---- a/trunk/ulp/librdmacm/src/cma.cpp
-+++ b/trunk/ulp/librdmacm/src/cma.cpp
-@@ -1359,7 +1359,6 @@ static int ucma_passive_ep(struct rdma_cm_id *id, struct rdma_addrinfo *res,
-       int ret;\r
- \r
-       ret = rdma_bind_addr(id, res->ai_src_addr);\r
--printf("rdma_bind_addr %d\n", ret);\r
-       if (ret)\r
-               return ret;\r
- \r
-@@ -1385,21 +1384,17 @@ int rdma_create_ep(struct rdma_cm_id **id, struct rdma_addrinfo *res,
-       struct rdma_cm_id *cm_id;\r
-       int ret;\r
- \r
--printf("rdma_create_ep\n");\r
-       ret = rdma_create_id(NULL, &cm_id, NULL, (enum rdma_port_space) res->ai_port_space);\r
--printf("rdma_create_id %d\n", ret);\r
-       if (ret)\r
-               return ret;\r
- \r
-       if (res->ai_flags & RAI_PASSIVE) {\r
--printf("rdma_create_ep - passive\n");\r
-               ret = ucma_passive_ep(cm_id, res, pd, qp_init_attr);\r
-               if (ret)\r
-                       goto err;\r
-               goto out;\r
-       }\r
- \r
--printf("rdma_create_ep - active\n");\r
-       ret = rdma_resolve_addr(cm_id, res->ai_src_addr, res->ai_dst_addr, 2000);\r
-       if (ret)\r
-               goto err;

diff --git a/patches/startup b/patches/startup
index fbdf3cc50a46b3b5495e463c83464a23e755b86c..81934d36ca6e3448ee7bfa5d8650dca2516995fe 100644 (file)
--- a/patches/startup
+++ b/patches/startup
@@ -1,5 +1,5 @@
 Bottom: 589dd94a34abf4e2921d4a8205615bc02ab645a2
-Top:    38c2985a44cf7bf6c9797cc313edebe2f3e7ddd7
+Top:    b2c734b11bd0f2946023e6ac06ccc9f4117f0a30
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-16 15:03:51 -0700
 
@@ -9,16 +9,10 @@ librdmacm: initialize wsa
 ---
 
 diff --git a/trunk/ulp/librdmacm/src/addrinfo.cpp b/trunk/ulp/librdmacm/src/addrinfo.cpp
-index b9642fe..26a465a 100644
+index b9642fe..5d53ca6 100644
 --- a/trunk/ulp/librdmacm/src/addrinfo.cpp
 +++ b/trunk/ulp/librdmacm/src/addrinfo.cpp
-@@ -36,11 +36,40 @@
- \r
- #include <windows.h>\r
- #include <winsock2.h>\r
-+#include <stdio.h>\r
- \r
- #include "cma.h"\r
+@@ -41,6 +41,34 @@
  #include <rdma/rdma_cma.h>\r
  #include <rdma/rdma_verbs.h>\r
  \r
@@ -53,7 +47,7 @@ index b9642fe..26a465a 100644
  static void ucma_convert_to_ai(struct addrinfo *ai, struct rdma_addrinfo *rai)\r
  {\r
        memset(ai, 0, sizeof *ai);\r
-@@ -136,12 +165,13 @@ int rdma_getaddrinfo(char *node, char *service,
+@@ -136,12 +164,13 @@ int rdma_getaddrinfo(char *node, char *service,
        struct addrinfo *ai;\r
        int ret;\r
  \r
@@ -68,7 +62,7 @@ index b9642fe..26a465a 100644
  \r
        rai = (struct rdma_addrinfo *) malloc(sizeof(*rai));\r
        if (!rai) {\r
-@@ -149,6 +179,8 @@ int rdma_getaddrinfo(char *node, char *service,
+@@ -149,6 +178,8 @@ int rdma_getaddrinfo(char *node, char *service,
                goto err1;\r
        }\r
  \r
@@ -77,43 +71,9 @@ index b9642fe..26a465a 100644
        ret = ucma_convert_to_rai(rai, ai);\r
        if (ret)\r
                goto err2;\r
-@@ -208,4 +240,5 @@ void rdma_freeaddrinfo(struct rdma_addrinfo *res)
+@@ -208,4 +239,5 @@ void rdma_freeaddrinfo(struct rdma_addrinfo *res)
  \r
                free(rai);\r
        }\r
 +      ucma_shutdown();\r
- }\r
-diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
-index 835d020..46ec273 100644
---- a/trunk/ulp/librdmacm/src/cma.cpp
-+++ b/trunk/ulp/librdmacm/src/cma.cpp
-@@ -1359,6 +1359,7 @@ static int ucma_passive_ep(struct rdma_cm_id *id, struct rdma_addrinfo *res,
-       int ret;\r
- \r
-       ret = rdma_bind_addr(id, res->ai_src_addr);\r
-+printf("rdma_bind_addr %d\n", ret);\r
-       if (ret)\r
-               return ret;\r
- \r
-@@ -1384,17 +1385,21 @@ int rdma_create_ep(struct rdma_cm_id **id, struct rdma_addrinfo *res,
-       struct rdma_cm_id *cm_id;\r
-       int ret;\r
- \r
-+printf("rdma_create_ep\n");\r
-       ret = rdma_create_id(NULL, &cm_id, NULL, (enum rdma_port_space) res->ai_port_space);\r
-+printf("rdma_create_id %d\n", ret);\r
-       if (ret)\r
-               return ret;\r
- \r
-       if (res->ai_flags & RAI_PASSIVE) {\r
-+printf("rdma_create_ep - passive\n");\r
-               ret = ucma_passive_ep(cm_id, res, pd, qp_init_attr);\r
-               if (ret)\r
-                       goto err;\r
-               goto out;\r
-       }\r
- \r
-+printf("rdma_create_ep - active\n");\r
-       ret = rdma_resolve_addr(cm_id, res->ai_src_addr, res->ai_dst_addr, 2000);\r
-       if (ret)\r
-               goto err;
+ }