refresh

diff --git a/meta b/meta
index a98981e4305f0b7054e1181b61419402545e6098..d40818efdd5596a30e1e4c7a1bcb7a2460264f92 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 2041a33aa7f8a56a39109a12b115997bf35d85d3
-Head: 7e4e214a3d340320428f1e77351b94747f9c62d2
+Previous: a28decc913836439fb934b43aa842228a43ccf3b
+Head: 3dc679d022e813709a18afce79297bb0d74a7b29
 Applied:
   lmc: 6f466455d64655ca852ff6942c44052592296c75
-  xref-lid: 0d20222d86b5c31cf551f0bcb6c9dd45e4fe03cb
-  refresh-temp: 7e4e214a3d340320428f1e77351b94747f9c62d2
+  xref-lid: 3dc679d022e813709a18afce79297bb0d74a7b29
 Unapplied:
   ibacm-check-for-nodelay-on-pat: 1540687d721504ec1810aac7cc53ec7272415eb9
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5f7a634..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: cd31696449dd581e6e1d2f2b57cf09b7d90bc0e1
-Top:    397103ddcac1a2185d9fc05647992788c404c7bc
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-15 17:32:26 -0800
-
-Refresh of xref-lid
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 3dffef2..cbeba90 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -1717,8 +1717,7 @@ static int
- acm_is_port_addr(struct acm_port *port, struct ibv_path_record *path)
- {
-       if (path->slid) {
--              return (port->lid == ntohs(path.slid) & port->lmc);
--              new_ah->src_path_mask = (1 << port_attr.lmc) - 1
-+              return (port->lid == (ntohs(path.slid) & ~((uint16_t) port->lid_mask)));
-       }
- 
- }

diff --git a/patches/xref-lid b/patches/xref-lid
index 2ff1e7f77adb6f742e9fc3ca673329cac0dbbe1a..0ebc960ce38450f0957e9bfbbfe4403dba0414be 100644 (file)
--- a/patches/xref-lid
+++ b/patches/xref-lid
@@ -1,5 +1,5 @@
 Bottom: 44bac54467fee44e1945f9a0311472cc84ac5b50
-Top:    cd31696449dd581e6e1d2f2b57cf09b7d90bc0e1
+Top:    397103ddcac1a2185d9fc05647992788c404c7bc
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-13 10:35:40 -0800
 
@@ -19,7 +19,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index e8f7a74..3dffef2 100644
+index e8f7a74..cbeba90 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -280,6 +280,11 @@ acm_format_name(int level, char *name, size_t name_size,
@@ -34,7 +34,7 @@ index e8f7a74..3dffef2 100644
  static int acm_compare_dest(const void *dest1, const void *dest2)
  {
        return memcmp(dest1, dest2, ACM_MAX_ADDRESS);
-@@ -1708,6 +1713,16 @@ static uint8_t acm_svr_query_sa(struct acm_ep *ep, struct acm_request *req)
+@@ -1708,6 +1713,15 @@ static uint8_t acm_svr_query_sa(struct acm_ep *ep, struct acm_request *req)
        return ACM_STATUS_SUCCESS;
  }
  
@@ -42,8 +42,7 @@ index e8f7a74..3dffef2 100644
 +acm_is_port_addr(struct acm_port *port, struct ibv_path_record *path)
 +{
 +      if (path->slid) {
-+              return (port->lid == ntohs(path.slid) & port->lmc);
-+              new_ah->src_path_mask = (1 << port_attr.lmc) - 1
++              return (port->lid == (ntohs(path.slid) & ~((uint16_t) port->lid_mask)));
 +      }
 +
 +}
@@ -51,7 +50,7 @@ index e8f7a74..3dffef2 100644
  static struct acm_ep *
  acm_get_ep(struct acm_ep_addr_data *data)
  {
-@@ -1768,12 +1783,6 @@ acm_svr_query(struct acm_client *client, struct acm_resolve_msg *msg)
+@@ -1768,12 +1782,6 @@ acm_svr_query(struct acm_client *client, struct acm_resolve_msg *msg)
                goto resp;
        }
  
@@ -64,7 +63,7 @@ index e8f7a74..3dffef2 100644
        ep = acm_get_ep(&msg->data[0]);
        if (!ep) {
                acm_log(1, "notice - could not find local end point\n");
-@@ -2060,6 +2069,99 @@ put:
+@@ -2060,6 +2068,99 @@ put:
        return ret;
  }
  
@@ -164,7 +163,7 @@ index e8f7a74..3dffef2 100644
  static void acm_svr_receive(struct acm_client *client)
  {
        struct acm_msg msg;
-@@ -2085,7 +2187,11 @@ static void acm_svr_receive(struct acm_client *client)
+@@ -2085,7 +2186,11 @@ static void acm_svr_receive(struct acm_client *client)
        }
  
        if (resolve_msg->data[0].type == ACM_EP_INFO_PATH) {