refresh (create temporary patch)

diff --git a/meta b/meta
index 063d3159b73c96f0f17370dac044b58274d7a342..55fdd904a735e4b46a353a38645a942644f738c9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 6a14eb6a550d68f0a614831316e9e1da5af94577
-Head: 6c95ce3f56a9107a63d0b8da0333ca9feaf868b0
+Previous: 9644a28d429b344eb146d2f8f40acd55a0c5fff5
+Head: 4142d27d98c07ceab1f5f2efd3bfc25c58626e93
 Applied:
   opt_mc_av: 1c9cb4576f95c0d2cc7bf96d33cc6efe5f6c313d
   one_mc_join: 6c95ce3f56a9107a63d0b8da0333ca9feaf868b0
+  refresh-temp: 4142d27d98c07ceab1f5f2efd3bfc25c58626e93
 Unapplied:
   addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..08d643a
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,23 @@
+Bottom: ff1f0e0cc0c31d7a9b01b551462a6a3a0612e4b9
+Top:    c93d236ca31c4be364371bb05930f374530864e6
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2011-04-01 16:02:08 -0700
+
+Refresh of one_mc_join
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index 0dbc23c..7c6cd11 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -1557,7 +1557,8 @@ static void acm_port_join(struct acm_port *port)
+               if ((ep->state = ep->mc_dest[0].state) != ACM_READY)
+                       continue;
+ 
+-              if (port->rate != min_rate || port->mtu != min_mtu)
++              if ((route_prot == ACM_ROUTE_PROT_ACM) &&
++                  (port->rate != min_rate || port->mtu != min_mtu))
+                       acm_join_group(ep, &port_gid, 0, 0, 0, port->rate, port->mtu);
+       }
+       acm_log(1, "joins for device %s port %d complete\n", dev->verbs->device->name,