X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fadj%2Fadj_mcast.c;h=9fbad482600fff21441a40cdb737407bf1a40502;hb=2af0e3a;hp=efc781de989021e40927aa590f878ce632b232be;hpb=db14f5aff69311d13a0a90baa3567e92f3faa783;p=vpp.git

diff --git a/src/vnet/adj/adj_mcast.c b/src/vnet/adj/adj_mcast.c
index efc781de989..9fbad482600 100644
--- a/src/vnet/adj/adj_mcast.c
+++ b/src/vnet/adj/adj_mcast.c
@@ -69,7 +69,7 @@ adj_mcast_add_or_lock (fib_protocol_t proto,
 	adj_mcasts[proto][sw_if_index] = adj_get_index(adj);
         adj_lock(adj_get_index(adj));
 
-	vnet_rewrite_init(vnm, sw_if_index,
+	vnet_rewrite_init(vnm, sw_if_index, link_type,
 			  adj_get_mcast_node(proto),
 			  vnet_tx_node_index_for_sw_interface(vnm, sw_if_index),
 			  &adj->rewrite_header);
@@ -101,8 +101,7 @@ adj_mcast_add_or_lock (fib_protocol_t proto,
 void
 adj_mcast_update_rewrite (adj_index_t adj_index,
                           u8 *rewrite,
-                          u8 offset,
-                          u32 mask)
+                          u8 offset)
 {
     ip_adjacency_t *adj;
 
@@ -121,12 +120,9 @@ adj_mcast_update_rewrite (adj_index_t adj_index,
                                         adj->rewrite_header.sw_if_index),
                                     rewrite);
     /*
-     * set the fields corresponding to the mcast IP address rewrite
-     * The mask must be stored in network byte order, since the packet's
-     * IP address will also be in network order.
+     * set the offset corresponding to the mcast IP address rewrite
      */
     adj->rewrite_header.dst_mcast_offset = offset;
-    adj->rewrite_header.dst_mcast_mask = clib_host_to_net_u32(mask);
 }
 
 /**
@@ -174,13 +170,7 @@ adj_mcast_midchain_update_rewrite (adj_index_t adj_index,
                                         adj->rewrite_header.sw_if_index),
                                     rewrite);
 
-    /*
-     * set the fields corresponding to the mcast IP address rewrite
-     * The mask must be stored in network byte order, since the packet's
-     * IP address will also be in network order.
-     */
     adj->rewrite_header.dst_mcast_offset = offset;
-    adj->rewrite_header.dst_mcast_mask = clib_host_to_net_u32(mask);
 }
 
 void
@@ -230,12 +220,14 @@ VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION(adj_mcast_interface_state_change);
  * @brief Invoked on each SW interface of a HW interface when the
  * HW interface state changes
  */
-static void
+static walk_rc_t
 adj_mcast_hw_sw_interface_state_change (vnet_main_t * vnm,
                                         u32 sw_if_index,
                                         void *arg)
 {
     adj_mcast_interface_state_change(vnm, sw_if_index, (uword) arg);
+
+    return (WALK_CONTINUE);
 }
 
 /**