interface: Remove residual dpdk bonding code

dpdk bonding code was removed in 19.08. However, there are still references
to VNET_SW_INTERFACE_FLAG_BOND_SLAVE which was set by the already removed
code.

Type: fix

Signed-off-by: Steven Luong <sluong@cisco.com>
Change-Id: I949a7281e6273f2733dd7532cc4a3bb4f3ce30de

diff --git a/src/vnet/interface.c b/src/vnet/interface.c
index 889ba50..9aaca46 100644 (file)
--- a/src/vnet/interface.c
+++ b/src/vnet/interface.c
@@ -394,15 +394,6 @@ vnet_sw_interface_set_flags_helper (vnet_main_t * vnm, u32 sw_if_index,
            }
        }
 
-      /* Do not change state for slave link of bonded interfaces */
-      if (si->flags & VNET_SW_INTERFACE_FLAG_BOND_SLAVE)
-       {
-         error = clib_error_return
-           (0, "not allowed as %U belong to a BondEthernet interface",
-            format_vnet_sw_interface_name, vnm, si);
-         goto done;
-       }
-
       /* Already in the desired state? */
       if ((si->flags & mask) == flags)
        goto done;

diff --git a/src/vnet/interface.h b/src/vnet/interface.h
index d3065dc..e6418f9 100644 (file)
--- a/src/vnet/interface.h
+++ b/src/vnet/interface.h
@@ -676,7 +676,7 @@ typedef enum vnet_sw_interface_flags_t_
 
   VNET_SW_INTERFACE_FLAG_UNNUMBERED = (1 << 3),
 
-  VNET_SW_INTERFACE_FLAG_BOND_SLAVE = (1 << 4),
+  __VNET_SW_INTERFACE_FLAG_UNUSED2 = (1 << 4),
 
   /* Interface does not appear in CLI/API */
   VNET_SW_INTERFACE_FLAG_HIDDEN = (1 << 5),

diff --git a/src/vnet/interface_format.c b/src/vnet/interface_format.c
index 209da18..47546c5 100644 (file)
--- a/src/vnet/interface_format.c
+++ b/src/vnet/interface_format.c
@@ -49,8 +49,6 @@ format_vnet_sw_interface_flags (u8 * s, va_list * args)
 
   if (flags & VNET_SW_INTERFACE_FLAG_ERROR)
     s = format (s, "error");
-  else if (flags & VNET_SW_INTERFACE_FLAG_BOND_SLAVE)
-    s = format (s, "bond-slave");
   else
     {
       s = format (s, "%s",

diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c
index 92cbaac..9702a9e 100644 (file)
--- a/src/vnet/interface_output.c
+++ b/src/vnet/interface_output.c
@@ -506,8 +506,7 @@ vnet_interface_output_node_inline_gso (vlib_main_t * vm,
 
   si = vnet_get_sw_interface (vnm, rt->sw_if_index);
   hi = vnet_get_sup_hw_interface (vnm, rt->sw_if_index);
-  if (!(si->flags & (VNET_SW_INTERFACE_FLAG_ADMIN_UP |
-                    VNET_SW_INTERFACE_FLAG_BOND_SLAVE)) ||
+  if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ||
       !(hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP))
     {
       vlib_simple_counter_main_t *cm;

diff --git a/src/vnet/lldp/lldp_cli.c b/src/vnet/lldp/lldp_cli.c
index 8bedfcf..4680292 100644 (file)
--- a/src/vnet/lldp/lldp_cli.c
+++ b/src/vnet/lldp/lldp_cli.c
@@ -100,8 +100,7 @@ lldp_cfg_intf_set (u32 hw_if_index, u8 ** port_desc, u8 ** mgmt_ip4,
 
       const vnet_sw_interface_t *sw =
        vnet_get_sw_interface (lm->vnet_main, hi->sw_if_index);
-      if (sw->flags & (VNET_SW_INTERFACE_FLAG_ADMIN_UP |
-                      VNET_SW_INTERFACE_FLAG_BOND_SLAVE))
+      if (sw->flags & (VNET_SW_INTERFACE_FLAG_ADMIN_UP))
        {
          lldp_schedule_intf (lm, n);
        }
@@ -576,8 +575,7 @@ format_lldp_intfs_detail (u8 * s, vlib_main_t * vm, const lldp_main_t * lm)
           }
 
         /* Interface shutdown */
-        if (!(sw->flags & (VNET_SW_INTERFACE_FLAG_ADMIN_UP |
-                           VNET_SW_INTERFACE_FLAG_BOND_SLAVE)))
+        if (!(sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
           {
             s = format(s, "Interface/peer state: interface down\n"
                        "Last packet sent: %U\n",