refresh

diff --git a/meta b/meta
index 1bfa7c072573de8cf1d58ff282a2b680afc06744..51c4ce085d4033acf8a5e6be2db34719ec0724fb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: d1df2e7e4cbf64fe7bb3d18c4748056293cce113
-Head: db7bb44337c7a15404057f9daa2d5ee06e22dbfc
+Previous: 8bf69784315c7da709db36afbd1a7f3ba9eb0324
+Head: 8e82fed961fdc57d84c7484cd2af701f09e74237
 Applied:
   rmcfg: 977896dc127018271adae25f7d637e098bad33d5
   acm_notes-txt-change-dos-forma: b07f140dd83b881c922f4c6b70cfa7145727044f
@@ -14,8 +14,7 @@ Applied:
   convert-linux-header-files-fro: 4561ebcdfee763675be6ac832befa738848c0fe7
   add-support-for-preloading-ipv: 90ac3a19740070583d60687b12bebe98743d130a
   add-option-to-allow-for-acm-ca: 4cdfa0bd31da50a9033f66550cfc070f47eeef8d
-  addrpre: 2eccd2dbf588b89f39be7431cccc97ab2e890f30
-  refresh-temp: db7bb44337c7a15404057f9daa2d5ee06e22dbfc
+  addrpre: 8e82fed961fdc57d84c7484cd2af701f09e74237
 Unapplied:
   notes-fmt: 988d784b42cdb9db05b1608a5cdb29c51215bd9e
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/addrpre b/patches/addrpre
index 51d00f4905eb6a245b615cd4318114b85ee355b7..f8e84c1da655552548f16e0519f5885eca95258f 100644 (file)
--- a/patches/addrpre
+++ b/patches/addrpre
@@ -1,5 +1,5 @@
 Bottom: 395b549366db321ef91ef6ea74a60d114c3c6bde
-Top:    a2b7371edcb3f03432c5554908c5aa5380dd8670
+Top:    5642e5cec144d875c68fbaeb7ad45c1ab55c1659
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-06-28 10:55:36 -0700
 
@@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index a57ab17..4a9f7b2 100644
+index a57ab17..7f926b4 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -2812,7 +2812,7 @@ static void acm_parse_hosts_file(struct acm_ep *ep)
@@ -77,7 +77,7 @@ index a57ab17..4a9f7b2 100644
 +                      dest->state = ACM_READY;
 +                      acm_put_dest(gid_dest);
 +              } else {
-+                      memcpy(dest->path.dgid, &ib_addr, 16);
++                      memcpy(&dest->path.dgid, &ib_addr, 16);
 +                      //ibv_query_gid(ep->port->dev->verbs, ep->port->port_num,
 +                      //              0, &dest->path.sgid);
 +                      dest->path.slid = htons(ep->port->lid);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 311af90..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: a2b7371edcb3f03432c5554908c5aa5380dd8670
-Top:    5642e5cec144d875c68fbaeb7ad45c1ab55c1659
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-06-28 16:32:23 -0700
-
-Refresh of addrpre
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 4a9f7b2..7f926b4 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2860,7 +2860,7 @@ static void acm_parse_hosts_file(struct acm_ep *ep)
-                       dest->state = ACM_READY;
-                       acm_put_dest(gid_dest);
-               } else {
--                      memcpy(dest->path.dgid, &ib_addr, 16);
-+                      memcpy(&dest->path.dgid, &ib_addr, 16);
-                       //ibv_query_gid(ep->port->dev->verbs, ep->port->port_num,
-                       //              0, &dest->path.sgid);
-                       dest->path.slid = htons(ep->port->lid);