commit

diff --git a/meta b/meta
index a44bac73b36f5d1a37706f5037d17db66d2a5c93..2f770c1f3c48aa8b2dd03083cbddd631a810f835 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 04139fe958a501069c6b3a19b71bb7f008ac846f
+Previous: a4c45ac52307ee40ddaa15b1c5d857385fa3efdf
 Head: 7f02c7869431b0fc83b0a84d8e28eae06c836ca3
 Applied:
-  ibacm-incorrect-return-value-c: 7f02c7869431b0fc83b0a84d8e28eae06c836ca3
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/ibacm-incorrect-return-value-c b/patches/ibacm-incorrect-return-value-c
deleted file mode 100644 (file)
index d8cd6d7..0000000
--- a/patches/ibacm-incorrect-return-value-c
+++ /dev/null
@@ -1,30 +0,0 @@
-Bottom: 0c45574395afa9ff24d6468cfce3f34b57af4525
-Top:    b858d90ca19ca7f3b77f4ff170ab420d2419f2fa
-Author: Kaike Wan <kaike.wan@intel.com>
-Date:   2014-07-17 13:16:01 -0700
-
-ibacm: Incorrect return value check in path resolution
-
-The returned variable "addr" should be checked instead of the variable "ep" in
-the function acm_svr_resolve_path() when query parameters are given in a path
-record (eg, slid/dlid, sgid/dgid, etc).
-
-Signed-off-by: Kaike Wan <kaike.wan@intel.com>
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index fae9d0b..11fda4c 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -946,7 +946,7 @@ acm_svr_resolve_path(struct acmc_client *client, struct acm_msg *msg)
-               msg->resolve_data[0].info.addr, sizeof *path);
-       acm_log(2, "path %s\n", log_data);
-       addr = acm_get_ep_address(&msg->resolve_data[0]);
--      if (!ep) {
-+      if (!addr) {
-               acm_log(0, "notice - unknown local end point address\n");
-               return acmc_resolve_response(client->index, msg,
-                                            ACM_STATUS_ESRCADDR);