udp: use pool safe reallocs

[vpp.git] / src / vnet / l2 / l2_bvi.h

diff --git a/src/vnet/l2/l2_bvi.h b/src/vnet/l2/l2_bvi.h
index 300ea81..67b8e50 100644 (file)
--- a/src/vnet/l2/l2_bvi.h
+++ b/src/vnet/l2/l2_bvi.h
@@ -32,7 +32,7 @@ static_always_inline u32
 l2_to_bvi_dmac_check (vnet_hw_interface_t * hi, u8 * dmac,
                      ethernet_interface_t * ei, u8 have_sec_dmac)
 {
-  mac_address_t *sec_addr;
+  ethernet_interface_address_t *sec_addr;
 
   if (ethernet_mac_address_equal (dmac, hi->hw_address))
     return TO_BVI_ERR_OK;
@@ -41,7 +41,7 @@ l2_to_bvi_dmac_check (vnet_hw_interface_t * hi, u8 * dmac,
     {
       vec_foreach (sec_addr, ei->secondary_addrs)
       {
-       if (ethernet_mac_address_equal (dmac, (u8 *) sec_addr))
+       if (ethernet_mac_address_equal (dmac, sec_addr->mac.bytes))
          return TO_BVI_ERR_OK;
       }
     }
@@ -72,7 +72,7 @@ l2_to_bvi (vlib_main_t * vlib_main,
       ethernet_interface_t *ei = ethernet_get_interface (em, hi->hw_if_index);
       u32 rv;
 
-      if (PREDICT_FALSE (vec_len (ei->secondary_addrs) > 0))
+      if (PREDICT_FALSE (ei && (vec_len (ei->secondary_addrs) > 0)))
        rv = l2_to_bvi_dmac_check (hi, e0->dst_address, ei,
                                   1 /* have_sec_dmac */ );
       else