refresh

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

diff --git a/patches/one_mc_join b/patches/one_mc_join
index 58e129ccb56bf0af635fd47330affcf24349d7bb..2b2c6448fc0c0a99a3a6c702a3103f4f94305540 100644 (file)
--- a/patches/one_mc_join
+++ b/patches/one_mc_join
@@ -1,5 +1,5 @@
 Bottom: ff1f0e0cc0c31d7a9b01b551462a6a3a0612e4b9
-Top:    ff1f0e0cc0c31d7a9b01b551462a6a3a0612e4b9
+Top:    c93d236ca31c4be364371bb05930f374530864e6
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-04-01 15:58:19 -0700
 
@@ -15,4 +15,17 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+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,

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 08d643a..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-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,