X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fethernet%2Farp.c;h=2f81da3240010bd12cc3d8de9c25848d5f880966;hb=2e7fbcc08152da5c6a17ed80ba08cd37edec6c8c;hp=75c7e20372a601fa16ad310be744de4ceafcbb62;hpb=70efbfcd49aaee207ff3d33ac60083fedd9f1eec;p=vpp.git

diff --git a/src/vnet/ethernet/arp.c b/src/vnet/ethernet/arp.c
index 75c7e20372a..2f81da32400 100644
--- a/src/vnet/ethernet/arp.c
+++ b/src/vnet/ethernet/arp.c
@@ -479,28 +479,30 @@ arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
 	}
       break;
     case IP_LOOKUP_NEXT_MCAST:
-      /*
-       * Construct a partial rewrite from the known ethernet mcast dest MAC
-       */
-      adj_mcast_update_rewrite
-	(ai,
-	 ethernet_build_rewrite (vnm,
-				 sw_if_index,
-				 adj->ia_link,
-				 ethernet_ip4_mcast_dst_addr ()));
-
-      /*
-       * Complete the remaining fields of the adj's rewrite to direct the
-       * complete of the rewrite at switch time by copying in the IP
-       * dst address's bytes.
-       * Ofset is 11 bytes from the end of the MAC header - which is three
-       * bytes into the desintation address. And we write 3 bytes.
-       */
-      adj->rewrite_header.dst_mcast_offset = 11;
-      adj->rewrite_header.dst_mcast_n_bytes = 3;
-
-      break;
+      {
+	/*
+	 * Construct a partial rewrite from the known ethernet mcast dest MAC
+	 */
+	u8 *rewrite;
+	u8 offset;
+
+	rewrite = ethernet_build_rewrite (vnm,
+					  sw_if_index,
+					  adj->ia_link,
+					  ethernet_ip4_mcast_dst_addr ());
+	offset = vec_len (rewrite) - 2;
+
+	/*
+	 * Complete the remaining fields of the adj's rewrite to direct the
+	 * complete of the rewrite at switch time by copying in the IP
+	 * dst address's bytes.
+	 * Ofset is 2 bytes into the MAC desintation address. And we copy 23 bits
+	 * from the address.
+	 */
+	adj_mcast_update_rewrite (ai, rewrite, offset, 0x007fffff);
 
+	break;
+      }
     case IP_LOOKUP_NEXT_DROP:
     case IP_LOOKUP_NEXT_PUNT:
     case IP_LOOKUP_NEXT_LOCAL: