Revert "bond: problem switching from l2 to l3"

During CSIT testing we discovered that LACP tests were failing and
producing coredumps. Reverting this patch fix the problem with VPP
crashing.

This reverts commit f23890138e02d4218c828c427f687f8ecdb0e165.

Change-Id: Icf97053ce1473350add885cbebe591f7f3efcbea
Signed-off-by: Peter Mikus <pmikus@cisco.com>

diff --git a/src/vnet/bonding/device.c b/src/vnet/bonding/device.c
index e288c57..c3ff566 100644 (file)
--- a/src/vnet/bonding/device.c
+++ b/src/vnet/bonding/device.c
@@ -104,17 +104,6 @@ bond_set_l2_mode_function (vnet_main_t * vnm,
        ethernet_set_rx_redirect (vnm, sif_hw, 1);
       }
     }
-  else if ((bif_hw->l2_if_count == 0) && (l2_if_adjust == -1))
-    {
-      /* Just removed last L2 subinterface on this port */
-      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);
-      }
-    }
 
   return 0;
 }