X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fethernet%2Farp.c;h=12c3fa47eacf0c2ec8636b1d02f595982ab77d34;hb=b3ca33ff4836eff054250c2b7a40dc778f377ea7;hp=6b651e7e20ae367a6b7a478e1ea158458cdd86d5;hpb=8f215b4a03a98bf94931a09b23ab0fbd8ccd1ab9;p=vpp.git

diff --git a/src/vnet/ethernet/arp.c b/src/vnet/ethernet/arp.c
index 6b651e7e20a..12c3fa47eac 100644
--- a/src/vnet/ethernet/arp.c
+++ b/src/vnet/ethernet/arp.c
@@ -520,7 +520,7 @@ arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
 	 * 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.
+	 * Offset is 2 bytes into the MAC destination address.
 	 */
 	adj_mcast_update_rewrite (ai, rewrite, offset);
 
@@ -1570,7 +1570,7 @@ vnet_arp_unset_ip4_over_ethernet (vnet_main_t * vnm,
 
 /**
  * @brief publish wildcard arp event
- * @param sw_if_index The interface on which the ARP entires are acted
+ * @param sw_if_index The interface on which the ARP entries are acted
  */
 static int
 vnet_arp_wc_publish (u32 sw_if_index,
@@ -2032,8 +2032,8 @@ vnet_proxy_arp_add_del (ip4_address_t * lo_addr,
 }
 
 /*
- * Remove any proxy arp entries asdociated with the
- * specificed fib.
+ * Remove any proxy arp entries associated with the
+ * specified fib.
  */
 int
 vnet_proxy_arp_fib_reset (u32 fib_id)
@@ -2410,6 +2410,9 @@ arp_term_l2bd (vlib_main_t * vm,
 
 	  if (PREDICT_FALSE (!macp0))
 	    goto next_l2_feature;	/* MAC not found */
+	  if (PREDICT_FALSE (arp0->ip4_over_ethernet[0].ip4.as_u32 ==
+			     arp0->ip4_over_ethernet[1].ip4.as_u32))
+	    goto next_l2_feature;	/* GARP */
 
 	  /* MAC found, send ARP reply -
 	     Convert ARP request packet to ARP reply */
@@ -2611,7 +2614,7 @@ send_ip4_garp_w_addr (vlib_main_t * vm,
 }
 
 /*
- * Remove any arp entries asociated with the specificed interface
+ * Remove any arp entries associated with the specified interface
  */
 static clib_error_t *
 vnet_arp_delete_sw_interface (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)