From: Tianyu Li <tianyu.li@arm.com>
Date: Wed, 26 May 2021 06:20:57 +0000 (+0800)
Subject: l2: fix vrrp prefix mac comparison
X-Git-Tag: v22.02-rc0~332
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F38%2F32638%2F3;p=vpp.git

l2: fix vrrp prefix mac comparison

VRRP prefix length is 5 bytes, doesn't make sense
to compare with 6 bytes mac address

Type: fix

Signed-off-by: Tianyu Li <tianyu.li@arm.com>
Change-Id: I70a9c9ca769f34a81cd568f9e6b9a3538e6ec710
---

diff --git a/src/vnet/l2/l2_arp_term.c b/src/vnet/l2/l2_arp_term.c
index 3fcd9c1c83d..17c8b1d84d0 100644
--- a/src/vnet/l2/l2_arp_term.c
+++ b/src/vnet/l2/l2_arp_term.c
@@ -332,8 +332,8 @@ arp_term_l2bd (vlib_main_t * vm,
 	      || ethernet_address_cast (arp0->ip4_over_ethernet[0].mac.bytes))
 	    {
 	      /* VRRP virtual MAC may be different to SMAC in ARP reply */
-	      if (!ethernet_mac_address_equal
-		  (arp0->ip4_over_ethernet[0].mac.bytes, vrrp_prefix))
+	      if (clib_memcmp (arp0->ip4_over_ethernet[0].mac.bytes,
+			       vrrp_prefix, sizeof (vrrp_prefix)) != 0)
 		{
 		  error0 = ETHERNET_ARP_ERROR_l2_address_mismatch;
 		  goto drop;