ikev2: fix session re-initiate after SA expires

[vpp.git] / src / vnet / bonding / device.c

diff --git a/src/vnet/bonding/device.c b/src/vnet/bonding/device.c
index 57f2806..b3069fe 100644 (file)
--- a/src/vnet/bonding/device.c
+++ b/src/vnet/bonding/device.c
@@ -24,7 +24,7 @@
 #include <vnet/bonding/node.h>
 #include <vppinfra/lb_hash_hash.h>
 #include <vnet/ip/ip.h>
-#include <vnet/ethernet/arp_packet.h>
+#include <vnet/ip-neighbor/ip_neighbor.h>
 
 #define foreach_bond_tx_error     \
   _(NONE, "no error")             \
@@ -99,9 +99,6 @@ bond_set_l2_mode_function (vnet_main_t * vnm,
        sif_hw = vnet_get_sup_hw_interface (vnm, *sw_if_index);
        ethernet_set_flags (vnm, sif_hw->hw_if_index,
                            ETHERNET_INTERFACE_FLAG_ACCEPT_ALL);
-
-       /* ensure all packets go to ethernet-input */
-       ethernet_set_rx_redirect (vnm, sif_hw, 1);
       }
     }
   else if ((bif_hw->l2_if_count == 0) && (l2_if_adjust == -1))
@@ -110,9 +107,8 @@ bond_set_l2_mode_function (vnet_main_t * vnm,
       vec_foreach (sw_if_index, bif->slaves)
       {
        sif_hw = vnet_get_sup_hw_interface (vnm, *sw_if_index);
-
-       /* Allow ip packets to go directly to ip4-input etc */
-       ethernet_set_rx_redirect (vnm, sif_hw, 0);
+       ethernet_set_flags (vnm, sif_hw->hw_if_index,
+                           /*ETHERNET_INTERFACE_FLAG_DEFAULT_L3 */ 0);
       }
     }
 
@@ -799,8 +795,7 @@ bond_active_interface_switch_cb (vnet_main_t * vnm, u32 sw_if_index,
 {
   bond_main_t *bm = &bond_main;
 
-  send_ip4_garp (bm->vlib_main, sw_if_index);
-  send_ip6_na (bm->vlib_main, sw_if_index);
+  ip_neighbor_advertise (bm->vlib_main, IP46_TYPE_BOTH, NULL, sw_if_index);
 
   return (WALK_CONTINUE);
 }