refresh

diff --git a/meta b/meta
index e566cc85ac01a70e0df12d2a42d67034fc43974e..b718cab5cc2c61d207a6610cf0577980e908c4c3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 7ba1be7c64fba8ecd0b4d2113ff330acd2004a29
-Head: 5db42dfdfb979d027c16eed406fdc54a22bdbdc1
+Previous: 7daab0af925ad07441ee1a0ced7b6142c96eeac1
+Head: 5c2bd1511d359e196016e30ee47624fde9c9d825
 Applied:
   build-preload: 934949885dc5db0c30a70378b7fc8c36d512e32f
-  chk-src: f188f778fc810d5ce6341230c273d0139ca1b50c
-  refresh-temp: 5db42dfdfb979d027c16eed406fdc54a22bdbdc1
+  chk-src: 5c2bd1511d359e196016e30ee47624fde9c9d825
 Unapplied:
   v1.0.16: b48e896757a21993ed2eac78662e02a54be5818e
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/chk-src b/patches/chk-src
index 618d5b108c55bba7c6138ccd06b2836b529c60dc..189ab2cbcbbec3bc034bf136a8e0b661f7fcdf60 100644 (file)
--- a/patches/chk-src
+++ b/patches/chk-src
@@ -1,5 +1,5 @@
 Bottom: 220121d634269cc5dec0c0d7bc1545acc1e3b8a9
-Top:    220121d634269cc5dec0c0d7bc1545acc1e3b8a9
+Top:    dfec70d648229122a223c74fd6c162bb7057df14
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-11 11:54:39 -0700
 
@@ -14,4 +14,17 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/cma.c b/src/cma.c
+index f688c4c..86dd787 100755
+--- a/src/cma.c
++++ b/src/cma.c
+@@ -811,6 +811,9 @@ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
+               return ERR(EINVAL);
+ 
+       src_len = ucma_addrlen(src_addr);
++      if (src_addr && !src_len)
++              return ERR(EINVAL);
++
+       if (af_ib_support)
+               return rdma_resolve_addr2(id, src_addr, src_len, dst_addr,
+                                         dst_len, timeout_ms);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 51c0b45..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: 220121d634269cc5dec0c0d7bc1545acc1e3b8a9
-Top:    dfec70d648229122a223c74fd6c162bb7057df14
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-11 11:56:21 -0700
-
-Refresh of chk-src
-
----
-
-diff --git a/src/cma.c b/src/cma.c
-index f688c4c..86dd787 100755
---- a/src/cma.c
-+++ b/src/cma.c
-@@ -811,6 +811,9 @@ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
-               return ERR(EINVAL);
- 
-       src_len = ucma_addrlen(src_addr);
-+      if (src_addr && !src_len)
-+              return ERR(EINVAL);
-+
-       if (af_ib_support)
-               return rdma_resolve_addr2(id, src_addr, src_len, dst_addr,
-                                         dst_len, timeout_ms);