refresh

diff --git a/meta b/meta
index 8608c409a23d8d0cc4f94c24127e1aabc1209887..f09372c25b09e361770673163dbcc8aecd88bfe1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: b51a96e3402684345d80ce4913fa02d046115c94
-Head: 6d469f050801f422e7b8fb89ffa1258a1e235f8b
+Previous: 18fcf6f05b999f4300f684cdd925eae53b4f08fe
+Head: 16e77c3da4ced4b874900ec05d82d3abb297dcde
 Applied:
   sync: 452ce3b051e10e10363baa77834962a89267e052
   pre-af-ib: 73504ef1f812bea6d1fd59f194f90e5194ca2efa
@@ -12,8 +12,7 @@ Applied:
   getreq: 1ef2ab06b60a1192a1b2af253d75e187ecc68381
   ep: 47348de149bd19aa0f7d1ee293e5c2157c181c26
   samples: 69798ede2a2f96a442fe907f87df6017f58ca998
-  startup: 532ffcf220017f193924c8cd9c8b38334edac328
-  refresh-temp: 6d469f050801f422e7b8fb89ffa1258a1e235f8b
+  startup: 16e77c3da4ced4b874900ec05d82d3abb297dcde
 Unapplied:
   cq-status: d4535a68c8d41302c9ee9d44b98a75ea19b4f172
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index db9970f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 5f227c6cf1b79c41a6917ac4c4ca4795a0df3852
-Top:    20d38e0287dab1bf65af63cd9d036be80a928c2c
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-16 15:08:44 -0700
-
-Refresh of startup
-
----
-
-diff --git a/trunk/ulp/librdmacm/src/addrinfo.cpp b/trunk/ulp/librdmacm/src/addrinfo.cpp
-index acdc34d..e082079 100644
---- a/trunk/ulp/librdmacm/src/addrinfo.cpp
-+++ b/trunk/ulp/librdmacm/src/addrinfo.cpp
-@@ -172,7 +172,7 @@ int rdma_getaddrinfo(char *node, char *service,
-       ret = getaddrinfo(node, service, &ai_hints, &ai);\r
- printf("getaddrinfo %d\n", ret);\r
-       if (ret)\r
--              return ret;\r
-+              return rdmaw_wsa_errno(ret);\r
- \r
-       rai = (struct rdma_addrinfo *) malloc(sizeof(*rai));\r
-       if (!rai) {

diff --git a/patches/startup b/patches/startup
index 60eb05b574c09cc717aa73a69762a1672932d17f..b982a63885358773d99d5c1bd399a6a9374021a5 100644 (file)
--- a/patches/startup
+++ b/patches/startup
@@ -1,5 +1,5 @@
 Bottom: 589dd94a34abf4e2921d4a8205615bc02ab645a2
-Top:    5f227c6cf1b79c41a6917ac4c4ca4795a0df3852
+Top:    20d38e0287dab1bf65af63cd9d036be80a928c2c
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-16 15:03:51 -0700
 
@@ -9,7 +9,7 @@ librdmacm: initialize wsa
 ---
 
 diff --git a/trunk/ulp/librdmacm/src/addrinfo.cpp b/trunk/ulp/librdmacm/src/addrinfo.cpp
-index b9642fe..acdc34d 100644
+index b9642fe..e082079 100644
 --- a/trunk/ulp/librdmacm/src/addrinfo.cpp
 +++ b/trunk/ulp/librdmacm/src/addrinfo.cpp
 @@ -36,11 +36,40 @@
@@ -53,7 +53,7 @@ index b9642fe..acdc34d 100644
  static void ucma_convert_to_ai(struct addrinfo *ai, struct rdma_addrinfo *rai)\r
  {\r
        memset(ai, 0, sizeof *ai);\r
-@@ -136,10 +165,12 @@ int rdma_getaddrinfo(char *node, char *service,
+@@ -136,12 +165,14 @@ int rdma_getaddrinfo(char *node, char *service,
        struct addrinfo *ai;\r
        int ret;\r
  \r
@@ -64,8 +64,11 @@ index b9642fe..acdc34d 100644
        ret = getaddrinfo(node, service, &ai_hints, &ai);\r
 +printf("getaddrinfo %d\n", ret);\r
        if (ret)\r
-               return ret;\r
+-              return ret;\r
++              return rdmaw_wsa_errno(ret);\r
  \r
+       rai = (struct rdma_addrinfo *) malloc(sizeof(*rai));\r
+       if (!rai) {\r
 @@ -208,4 +239,5 @@ void rdma_freeaddrinfo(struct rdma_addrinfo *res)
  \r
                free(rai);\r