refresh

diff --git a/meta b/meta
index 549f6d243a5873ca145d22699e258e19578ddd59..573086542063968c9c5693bd540fb5489aebfa43 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 22bb68a6df578e7983327c036b7d7464e00bb57c
-Head: ede8ebbcfb75fdc1bb424beb27f2ab8a4661ba69
+Previous: 66376b079eef6d97e2f10c0d0d239df3255f55db
+Head: b88d4dfeaedcc085e5e588cf7aa1b0a2ae58316f
 Applied:
   dapl-evd: ede541a6ba3d7d2a69f95b691f69eb9a315bb75d
-  cma-priv-data: 3266056679c9c6a60a39a7ab2da2ce32fe704796
-  refresh-temp: ede8ebbcfb75fdc1bb424beb27f2ab8a4661ba69
+  cma-priv-data: b88d4dfeaedcc085e5e588cf7aa1b0a2ae58316f
 Unapplied:
   overlap: dfe75689835ce5dc1dbe80fd8c8ca144db6383b9
   dapl-qp: 57f50f5e232bbdddff67fc4dae43c66cfce81c5e

diff --git a/patches/cma-priv-data b/patches/cma-priv-data
index cc20a901e810dacbf793c6b33c8471787f620ccd..48a926d397b306ebc0188729f751d5b533d38621 100644 (file)
--- a/patches/cma-priv-data
+++ b/patches/cma-priv-data
@@ -1,5 +1,5 @@
 Bottom: ebe6c342ce034412580dd890057e8a7cd24198c2
-Top:    ebe6c342ce034412580dd890057e8a7cd24198c2
+Top:    a29a4793e7a5376c6cc2d9879e70b4ba09e1f492
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-09-17 14:13:29 -0700
 
@@ -10,4 +10,17 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
+index 835d020..215bdf6 100644
+--- a/trunk/ulp/librdmacm/src/cma.cpp
++++ b/trunk/ulp/librdmacm/src/cma.cpp
+@@ -765,6 +765,10 @@ static int ucma_valid_param(struct cma_id_private *id_priv,
+               return rdma_seterrno(EINVAL);\r
+       }\r
+ \r
++      if (param->private_data_len > sizeof(((WV_CONNECT_PARAM *) NULL)->Data)) {\r
++              return rdma_seterrno(EINVAL);\r
++      }\r
++\r
+       return 0;\r
+ }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a27dbb2..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: ebe6c342ce034412580dd890057e8a7cd24198c2
-Top:    a29a4793e7a5376c6cc2d9879e70b4ba09e1f492
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-09-17 14:13:47 -0700
-
-Refresh of cma-priv-data
-
----
-
-diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
-index 835d020..215bdf6 100644
---- a/trunk/ulp/librdmacm/src/cma.cpp
-+++ b/trunk/ulp/librdmacm/src/cma.cpp
-@@ -765,6 +765,10 @@ static int ucma_valid_param(struct cma_id_private *id_priv,
-               return rdma_seterrno(EINVAL);\r
-       }\r
- \r
-+      if (param->private_data_len > sizeof(((WV_CONNECT_PARAM *) NULL)->Data)) {\r
-+              return rdma_seterrno(EINVAL);\r
-+      }\r
-+\r
-       return 0;\r
- }