refresh

diff --git a/meta b/meta
index 0fb13ee1bd367abb0528a8a24ebef208b5e4a148..b979cd6f9b78f21634fc78e7ff742b4476098860 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: ac49a44b12d75145a6096c38097da4c9621afdfa
-Head: 262f650c5a6b0c83378314654430de842948325e
+Previous: 93f516190eeddb436a23c30714cf76370da670ec
+Head: 69798ede2a2f96a442fe907f87df6017f58ca998
 Applied:
   sync: 452ce3b051e10e10363baa77834962a89267e052
   pre-af-ib: 73504ef1f812bea6d1fd59f194f90e5194ca2efa
@@ -11,8 +11,7 @@ Applied:
   gai: 9730577d0bf4f053ec4c96eaa6d894144a75ce58
   getreq: 1ef2ab06b60a1192a1b2af253d75e187ecc68381
   ep: 47348de149bd19aa0f7d1ee293e5c2157c181c26
-  samples: e9cf209dc778105199ae5d189f750657ca942353
-  refresh-temp: 262f650c5a6b0c83378314654430de842948325e
+  samples: 69798ede2a2f96a442fe907f87df6017f58ca998
 Unapplied:
   cq-status: d4535a68c8d41302c9ee9d44b98a75ea19b4f172
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index b718c15..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,49 +0,0 @@
-Bottom: d976191e98895ad330bb596fea1ba14ef7f4332e
-Top:    589dd94a34abf4e2921d4a8205615bc02ab645a2
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-16 14:02:58 -0700
-
-Refresh of samples
-
----
-
-diff --git a/trunk/ulp/librdmacm/examples/rdma_client/rdma_client.c b/trunk/ulp/librdmacm/examples/rdma_client/rdma_client.c
-index 2e33cf6..e0a394e 100644
---- a/trunk/ulp/librdmacm/examples/rdma_client/rdma_client.c
-+++ b/trunk/ulp/librdmacm/examples/rdma_client/rdma_client.c
-@@ -107,7 +107,7 @@ static int run(void)
-       return 0;\r
- }\r
- \r
--int main(int argc, char **argv)\r
-+int __cdecl main(int argc, char **argv)\r
- {\r
-       int op, ret;\r
- \r
-diff --git a/trunk/ulp/librdmacm/examples/rdma_server/rdma_server.c b/trunk/ulp/librdmacm/examples/rdma_server/rdma_server.c
-index 575ad44..8be1577 100644
---- a/trunk/ulp/librdmacm/examples/rdma_server/rdma_server.c
-+++ b/trunk/ulp/librdmacm/examples/rdma_server/rdma_server.c
-@@ -125,7 +125,7 @@ static int run(void)
-       return 0;\r
- }\r
- \r
--int main(int argc, char **argv)\r
-+int __cdecl main(int argc, char **argv)\r
- {\r
-       int op, ret;\r
- \r
-diff --git a/trunk/ulp/librdmacm/include/rdma/rdma_verbs.h b/trunk/ulp/librdmacm/include/rdma/rdma_verbs.h
-index 46ebebc..feb01be 100644
---- a/trunk/ulp/librdmacm/include/rdma/rdma_verbs.h
-+++ b/trunk/ulp/librdmacm/include/rdma/rdma_verbs.h
-@@ -160,7 +160,8 @@ rdma_post_recv(struct rdma_cm_id *id, void *context, void *addr,
- {
-       struct ibv_sge sge;
- 
--      assert((addr >= mr->addr) && ((addr + length) <= (mr->addr + mr->length)));
-+      assert((addr >= mr->addr) &&
-+                 (((uint8_t) addr + length) <= ((uint8_t) mr->addr + mr->length)));
-       sge.addr = (uint64_t) (uintptr_t) addr;
-       sge.length = (uint32_t) length;
-       sge.lkey = mr->lkey;

diff --git a/patches/samples b/patches/samples
index dd6bb19e4509f3a4360b1ae7c048b72d4dee461e..ff608083a783d130400f838ac5f37370ce66b9ea 100644 (file)
--- a/patches/samples
+++ b/patches/samples
@@ -1,5 +1,5 @@
 Bottom: 20a010e4b9995e87e5aa659a2021d1dc6550af60
-Top:    d976191e98895ad330bb596fea1ba14ef7f4332e
+Top:    589dd94a34abf4e2921d4a8205615bc02ab645a2
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-16 12:05:39 -0700
 
@@ -67,7 +67,7 @@ index 0000000..a0c0627
 +!INCLUDE ..\..\..\..\inc\openib.def\r
 diff --git a/trunk/ulp/librdmacm/examples/rdma_client/rdma_client.c b/trunk/ulp/librdmacm/examples/rdma_client/rdma_client.c
 new file mode 100644
-index 0000000..2e33cf6
+index 0000000..e0a394e
 --- /dev/null
 +++ b/trunk/ulp/librdmacm/examples/rdma_client/rdma_client.c
 @@ -0,0 +1,134 @@
@@ -180,7 +180,7 @@ index 0000000..2e33cf6
 +      return 0;\r
 +}\r
 +\r
-+int main(int argc, char **argv)\r
++int __cdecl main(int argc, char **argv)\r
 +{\r
 +      int op, ret;\r
 +\r
@@ -254,7 +254,7 @@ index 0000000..a0c0627
 +!INCLUDE ..\..\..\..\inc\openib.def\r
 diff --git a/trunk/ulp/librdmacm/examples/rdma_server/rdma_server.c b/trunk/ulp/librdmacm/examples/rdma_server/rdma_server.c
 new file mode 100644
-index 0000000..575ad44
+index 0000000..8be1577
 --- /dev/null
 +++ b/trunk/ulp/librdmacm/examples/rdma_server/rdma_server.c
 @@ -0,0 +1,148 @@
@@ -385,7 +385,7 @@ index 0000000..575ad44
 +      return 0;\r
 +}\r
 +\r
-+int main(int argc, char **argv)\r
++int __cdecl main(int argc, char **argv)\r
 +{\r
 +      int op, ret;\r
 +\r
@@ -408,10 +408,10 @@ index 0000000..575ad44
 +}\r
 diff --git a/trunk/ulp/librdmacm/include/rdma/rdma_verbs.h b/trunk/ulp/librdmacm/include/rdma/rdma_verbs.h
 new file mode 100644
-index 0000000..46ebebc
+index 0000000..feb01be
 --- /dev/null
 +++ b/trunk/ulp/librdmacm/include/rdma/rdma_verbs.h
-@@ -0,0 +1,296 @@
+@@ -0,0 +1,297 @@
 +/*
 + * Copyright (c) 2010 Intel Corporation.  All rights reserved.
 + *
@@ -574,7 +574,8 @@ index 0000000..46ebebc
 +{
 +      struct ibv_sge sge;
 +
-+      assert((addr >= mr->addr) && ((addr + length) <= (mr->addr + mr->length)));
++      assert((addr >= mr->addr) &&
++                 (((uint8_t) addr + length) <= ((uint8_t) mr->addr + mr->length)));
 +      sge.addr = (uint64_t) (uintptr_t) addr;
 +      sge.length = (uint32_t) length;
 +      sge.lkey = mr->lkey;