refresh

diff --git a/meta b/meta
index a37854d827d26054c0d0a37c3f9a73e77d129f08..77aba165e6a1a9e6b39f5a717939b3b532fa98c9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 9260c68ae7739ffc02c7fa7b2a8b31cc6d5a53b3
-Head: 671b90654859a7c9bf8c3ed11e18c9068971d43a
+Previous: ba9874d996036604df34cd99758f4300d368d191
+Head: 720aaa185b9ce215b2d0678f103ccdf50fa7ffbf
 Applied:
   sync: 452ce3b051e10e10363baa77834962a89267e052
   pre-af-ib: 73504ef1f812bea6d1fd59f194f90e5194ca2efa
@@ -8,8 +8,7 @@ Applied:
   opt-cq: eb08384598a3829b40cc525aa2871e4e96817507
   max-rdma: 0dd5de47b21e3a7274ec258f969cfb366f7b5e46
   opt-cp: 0c67e54602a5ce5524698f8aba7f543f356a865a
-  gai: b5a8dd8a5b533f27f59a730602757ac220a66d41
-  refresh-temp: 671b90654859a7c9bf8c3ed11e18c9068971d43a
+  gai: 720aaa185b9ce215b2d0678f103ccdf50fa7ffbf
 Unapplied:
   cq-status: d4535a68c8d41302c9ee9d44b98a75ea19b4f172
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755

diff --git a/patches/gai b/patches/gai
index 1ac3313dd8180cb7cc065bfb45cd1d81321c85a7..76e5a0952718f14f6703f7cbade440193b1358ff 100644 (file)
--- a/patches/gai
+++ b/patches/gai
@@ -1,5 +1,5 @@
 Bottom: 5a4bd54fa45c17ca116710f00c36a7a09b2b37db
-Top:    5c341df87e859ab6d6dbc28cd60d6f6528b8e5e0
+Top:    fb20772a871decb83a5e3e8bdf727c07ca0f6777
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-16 10:05:05 -0700
 
@@ -69,12 +69,12 @@ index 6a8418a..4a98afa 100644
  \r
  INCLUDES = ..\include;..\..\..\inc;..\..\..\inc\user;..\..\libibverbs\include;\\r
                   ..\..\..\inc\user\linux;\r
-diff --git a/trunk/ulp/librdmacm/src/addrinfo.c b/trunk/ulp/librdmacm/src/addrinfo.c
+diff --git a/trunk/ulp/librdmacm/src/addrinfo.cpp b/trunk/ulp/librdmacm/src/addrinfo.cpp
 new file mode 100644
-index 0000000..8e929ed
+index 0000000..2ef1f38
 --- /dev/null
-+++ b/trunk/ulp/librdmacm/src/addrinfo.c
-@@ -0,0 +1,211 @@
++++ b/trunk/ulp/librdmacm/src/addrinfo.cpp
+@@ -0,0 +1,209 @@
 +/*
 + * Copyright (c) 2010 Intel Corporation.  All rights reserved.
 + *
@@ -111,10 +111,8 @@ index 0000000..8e929ed
 +#  include <config.h>
 +#endif /* HAVE_CONFIG_H */
 +
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netdb.h>
-+#include <unistd.h>
++#include <windows.h>\r
++#include <winsock2.h>\r
 +
 +#include "cma.h"
 +#include <rdma/rdma_cma.h>
@@ -183,11 +181,11 @@ index 0000000..8e929ed
 +              break;
 +      }
 +
-+      addr = malloc(ai->ai_addrlen);
++      addr = (struct sockaddr *) malloc(ai->ai_addrlen);
 +      if (!addr)
 +              return rdma_seterrno(ENOMEM);
 +
-+      canonname = ai->ai_canonname ? malloc(strlen(ai->ai_canonname) + 1) : NULL;
++      canonname = (char *) (ai->ai_canonname ? malloc(strlen(ai->ai_canonname) + 1) : NULL);
 +      if (canonname)
 +              strcpy(canonname, ai->ai_canonname);
 +
@@ -221,7 +219,7 @@ index 0000000..8e929ed
 +      if (ret)
 +              return ret;
 +
-+      rai = malloc(sizeof(*rai));
++      rai = (struct rdma_addrinfo *) malloc(sizeof(*rai));
 +      if (!rai) {
 +              ret = rdma_seterrno(ENOMEM);
 +              goto err1;
@@ -232,7 +230,7 @@ index 0000000..8e929ed
 +              goto err2;
 +
 +      if (!rai->ai_src_len && hints && hints->ai_src_len) {
-+              rai->ai_src_addr = calloc(1, hints->ai_src_len);
++              rai->ai_src_addr = (struct sockaddr *) calloc(1, hints->ai_src_len);
 +              if (!rai->ai_src_addr) {
 +                      ret = rdma_seterrno(ENOMEM);
 +                      goto err2;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1837a50..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,61 +0,0 @@
-Bottom: 5c341df87e859ab6d6dbc28cd60d6f6528b8e5e0
-Top:    fb20772a871decb83a5e3e8bdf727c07ca0f6777
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-16 10:27:47 -0700
-
-Refresh of gai
-
----
-
-diff --git a/trunk/ulp/librdmacm/src/addrinfo.c b/trunk/ulp/librdmacm/src/addrinfo.cpp
-similarity index 93%
-rename from trunk/ulp/librdmacm/src/addrinfo.c
-rename to trunk/ulp/librdmacm/src/addrinfo.cpp
-index 8e929ed..2ef1f38 100644
---- a/trunk/ulp/librdmacm/src/addrinfo.c
-+++ b/trunk/ulp/librdmacm/src/addrinfo.cpp
-@@ -34,10 +34,8 @@
- #  include <config.h>
- #endif /* HAVE_CONFIG_H */
- 
--#include <sys/types.h>
--#include <sys/socket.h>
--#include <netdb.h>
--#include <unistd.h>
-+#include <windows.h>\r
-+#include <winsock2.h>\r
- 
- #include "cma.h"
- #include <rdma/rdma_cma.h>
-@@ -106,11 +104,11 @@ static int ucma_convert_to_rai(struct rdma_addrinfo *rai, struct addrinfo *ai)
-               break;
-       }
- 
--      addr = malloc(ai->ai_addrlen);
-+      addr = (struct sockaddr *) malloc(ai->ai_addrlen);
-       if (!addr)
-               return rdma_seterrno(ENOMEM);
- 
--      canonname = ai->ai_canonname ? malloc(strlen(ai->ai_canonname) + 1) : NULL;
-+      canonname = (char *) (ai->ai_canonname ? malloc(strlen(ai->ai_canonname) + 1) : NULL);
-       if (canonname)
-               strcpy(canonname, ai->ai_canonname);
- 
-@@ -144,7 +142,7 @@ int rdma_getaddrinfo(char *node, char *service,
-       if (ret)
-               return ret;
- 
--      rai = malloc(sizeof(*rai));
-+      rai = (struct rdma_addrinfo *) malloc(sizeof(*rai));
-       if (!rai) {
-               ret = rdma_seterrno(ENOMEM);
-               goto err1;
-@@ -155,7 +153,7 @@ int rdma_getaddrinfo(char *node, char *service,
-               goto err2;
- 
-       if (!rai->ai_src_len && hints && hints->ai_src_len) {
--              rai->ai_src_addr = calloc(1, hints->ai_src_len);
-+              rai->ai_src_addr = (struct sockaddr *) calloc(1, hints->ai_src_len);
-               if (!rai->ai_src_addr) {
-                       ret = rdma_seterrno(ENOMEM);
-                       goto err2;