refresh

diff --git a/meta b/meta
index 9db7b602205696331e6cb596c7c5dc2d55bca62e..26ffca751a18ef4cd35162a71db9c9f7cb53ce05 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 1e3ac9ee2a869053a338ed8c2ff350acefe0a2fe
-Head: d73496852e626037b9f0e1db0df970dea5e7cb02
+Previous: 0e1dc354ca380bb2ca2cbd0a0a9e0d2af53779b9
+Head: 18f5ad3501e034bb5f79af8f45cb742c677de550
 Applied:
   acm_snoop: 4241a1ee0838579443846233ba67f9f6464db855
   log_lid: 9bc99c564c67392596986084c29697a4fb55d006
   logging: 39170d53e725bd8dc493d1eea532c63fde504e61
   dest_string: d234c9d83479e496fa925c7f46b806d07a35d3d4
-  loop: c49efed0690847609c8ae85b1e6951ed0381e088
-  refresh-temp: d73496852e626037b9f0e1db0df970dea5e7cb02
+  loop: 18f5ad3501e034bb5f79af8f45cb742c677de550
 Unapplied:
 Hidden:

diff --git a/patches/loop b/patches/loop
index 935a4b9d6fe3be888921a198e5fdef690b8b8577..12b56a8c4f2093ba0329053de2a186b56d1babed 100644 (file)
--- a/patches/loop
+++ b/patches/loop
@@ -1,5 +1,5 @@
 Bottom: 586b39cacd2b705239045da946e474cb11840ae8
-Top:    d272f38dc5913b7f57e6169aebf6ad4b877102eb
+Top:    99c14cee568e20d5c05839010bd735d77fc6dff3
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-16 10:39:24 -0800
 
@@ -24,7 +24,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 77194ff..0f9f8f9 100644
+index 77194ff..78e3b42 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -204,6 +204,7 @@ static char log_file[128] = "stdout";
@@ -35,7 +35,7 @@ index 77194ff..0f9f8f9 100644
  static short server_port = 6125;
  static int timeout = 2000;
  static int retries = 15;
-@@ -2294,6 +2295,40 @@ static int acm_assign_ep_names(struct acm_ep *ep)
+@@ -2294,6 +2295,43 @@ static int acm_assign_ep_names(struct acm_ep *ep)
        return !index;
  }
  
@@ -45,6 +45,9 @@ index 77194ff..0f9f8f9 100644
 +      int i;
 +
 +      acm_log(2, "\n");
++      if (!loopback_prot)
++              return 0;
++
 +      for (i = 0; i < MAX_EP_ADDR && ep->addr_type[i]; i++) {
 +              dest = acm_acquire_dest(ep, ep->addr_type[i], ep->addr[i].addr);
 +              if (!dest) {
@@ -76,7 +79,7 @@ index 77194ff..0f9f8f9 100644
  static int acm_activate_ep(struct acm_port *port, struct acm_ep *ep, uint16_t pkey_index)
  {
        struct ibv_qp_init_attr init_attr;
-@@ -2383,6 +2418,11 @@ static int acm_activate_ep(struct acm_port *port, struct acm_ep *ep, uint16_t pk
+@@ -2383,6 +2421,11 @@ static int acm_activate_ep(struct acm_port *port, struct acm_ep *ep, uint16_t pk
        if (ret)
                goto err2;
  
@@ -88,7 +91,7 @@ index 77194ff..0f9f8f9 100644
        return 0;
  
  err2:
-@@ -2620,6 +2660,12 @@ static void acm_set_options(void)
+@@ -2620,6 +2663,12 @@ static void acm_set_options(void)
        }
  
        fclose(f);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4318d13..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: d272f38dc5913b7f57e6169aebf6ad4b877102eb
-Top:    99c14cee568e20d5c05839010bd735d77fc6dff3
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-16 15:48:23 -0800
-
-Refresh of loop
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 0f9f8f9..78e3b42 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2301,6 +2301,9 @@ static int acm_init_ep_loopback(struct acm_ep *ep)
-       int i;
- 
-       acm_log(2, "\n");
-+      if (!loopback_prot)
-+              return 0;
-+
-       for (i = 0; i < MAX_EP_ADDR && ep->addr_type[i]; i++) {
-               dest = acm_acquire_dest(ep, ep->addr_type[i], ep->addr[i].addr);
-               if (!dest) {