X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface.c;h=5cbbbf96055ba5e71c837961c902adf48eea6c84;hb=b474380f;hp=e04ba9b10afb59a9e7ce48313a0080001db00ee7;hpb=3b81a1e5f205482b8ea30edbfd39559c4368ac4d;p=vpp.git

diff --git a/src/vnet/interface.c b/src/vnet/interface.c
index e04ba9b10af..5cbbbf96055 100644
--- a/src/vnet/interface.c
+++ b/src/vnet/interface.c
@@ -425,7 +425,7 @@ vnet_sw_interface_set_flags_helper (vnet_main_t * vnm, u32 sw_if_index,
 	    }
 	}
 
-      /* Donot change state for slave link of bonded interfaces */
+      /* Do not change state for slave link of bonded interfaces */
       if (si->flags & VNET_SW_INTERFACE_FLAG_BOND_SLAVE)
 	{
 	  error = clib_error_return
@@ -650,10 +650,11 @@ vnet_delete_sw_interface (vnet_main_t * vnm, u32 sw_if_index)
     {
       config = vec_elt_at_index (l2input_main.configs, sw_if_index);
       if (config->xconnect)
-	set_int_l2_mode (vm, vnm, MODE_L3, config->output_sw_if_index, 0, 0,
-			 0, 0);
+	set_int_l2_mode (vm, vnm, MODE_L3, config->output_sw_if_index, 0,
+			 L2_BD_PORT_TYPE_NORMAL, 0, 0);
       if (config->xconnect || config->bridge)
-	set_int_l2_mode (vm, vnm, MODE_L3, sw_if_index, 0, 0, 0, 0);
+	set_int_l2_mode (vm, vnm, MODE_L3, sw_if_index, 0,
+			 L2_BD_PORT_TYPE_NORMAL, 0, 0);
     }
   vnet_clear_sw_interface_tag (vnm, sw_if_index);
 
@@ -1366,7 +1367,7 @@ vnet_interface_init (vlib_main_t * vm)
 	    vlib_node_fn_registration_t *fnr = c->tx_fn_registrations;
 	    int priority = -1;
 
-	    /* to avoid confusion, please remove ".tx_function" statiement
+	    /* to avoid confusion, please remove ".tx_function" statement
 	       from VNET_DEVICE_CLASS() if using function candidates */
 	    ASSERT (c->tx_function == 0);
 
@@ -1652,7 +1653,7 @@ default_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
     case IP_LOOKUP_NEXT_ARP:
     case IP_LOOKUP_NEXT_BCAST:
       /*
-       * default rewirte in neighbour adj
+       * default rewrite in neighbour adj
        */
       adj_nbr_update_rewrite
 	(ai,