Typos. A bunch of typos I've been collecting.

Change-Id: I53ab8d17914e6563110354e4052109ac02bf8f3b
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>

49 files changed, 113 insertions, 113 deletions

diff --git a/src/vnet/adj/adj.c b/src/vnet/adj/adj.c
index 9d18dbf2727..ee9a1440f60 100644
--- a/src/vnet/adj/adj.c
+++ b/src/vnet/adj/adj.c
@@ -213,7 +213,7 @@ adj_recursive_loop_detect (adj_index_t ai,
     case IP_LOOKUP_NEXT_ICMP_ERROR:
     case IP_LOOKUP_N_NEXT:
         /*
-         * these adjcencey types are terminal graph nodes, so there's no
+         * these adjacency types are terminal graph nodes, so there's no
          * possibility of a loop down here.
          */
 	break;
@@ -365,7 +365,7 @@ adj_child_remove (adj_index_t adj_index,
 }
 
 /*
- * Context for the walk to update the cached feture flags.
+ * Context for the walk to update the cached feature flags.
  */
 typedef struct adj_feature_update_t_
 {
@@ -715,8 +715,8 @@ adj_cli_counters_set (vlib_main_t * vm,
 }
 
 /*?
- * Enabe/disble per-adjacency counters. This is optional because it comes with
- * a non-negligible performance cost.
+ * Enable/disable per-adjacency counters. This is optional because it comes
+ * with a non-negligible performance cost.
  ?*/
 VLIB_CLI_COMMAND (adj_cli_counters_set_command, static) = {
     .path = "adjacency counters",
diff --git a/src/vnet/adj/adj_bfd.c b/src/vnet/adj/adj_bfd.c
index 624d22fbccf..b7ff64dcccf 100644
--- a/src/vnet/adj/adj_bfd.c
+++ b/src/vnet/adj/adj_bfd.c
@@ -161,7 +161,7 @@ adj_bfd_notify (bfd_listen_event_e event,
         {
             /*
              * lock the adj. add the delegate.
-             * Lockinging the adj prevents it being removed and thus maintains
+             * Locking the adj prevents it being removed and thus maintains
              * the BFD derived states
              */
             adj_lock(ai);
@@ -173,10 +173,10 @@ adj_bfd_notify (bfd_listen_event_e event,
 
             /*
              * it would be best here if we could ignore this create and just
-             * wait for the first update, but this is not posible because
+             * wait for the first update, but this is not possible because
              * BFD sessions are created in the down state, and can remain this
              * way without transitioning to another state if the peer is
-             * unresponxive. So we have to assuem down and wait for up.
+             * unresponsive. So we have to assume down and wait for up.
              */
             abd->abd_state = ADJ_BFD_STATE_DOWN;
             abd->abd_index = session->bs_idx;
@@ -188,7 +188,7 @@ adj_bfd_notify (bfd_listen_event_e event,
 
     case BFD_LISTEN_EVENT_UPDATE:
         /*
-         * state change up/dowm and
+         * state change up/down and
          */
         abd = adj_bfd_from_base(adj_delegate_get(adj_get(ai), ADJ_DELEGATE_BFD));
 
@@ -213,7 +213,7 @@ adj_bfd_notify (bfd_listen_event_e event,
         {
             /*
              * has an associated BFD tracking delegate
-             * remove the BFD tracking deletgate, update children, then
+             * remove the BFD tracking delegate, update children, then
              * unlock the adj
              */
             adj_delegate_remove(ai, ADJ_DELEGATE_BFD);
diff --git a/src/vnet/adj/adj_delegate.c b/src/vnet/adj/adj_delegate.c
index cd5301c1e77..17d6f0d6a09 100644
--- a/src/vnet/adj/adj_delegate.c
+++ b/src/vnet/adj/adj_delegate.c
@@ -23,7 +23,7 @@
 static adj_delegate_vft_t *ad_vfts;
 
 /**
- * The value of the last dynamically allocated delegeate value
+ * The value of the last dynamically allocated delegate value
  */
 static adj_delegate_type_t ad_max_id = ADJ_DELEGATE_LAST;
 
diff --git a/src/vnet/adj/adj_l2.c b/src/vnet/adj/adj_l2.c
index 8a2126b2d7f..a289158c7f3 100644
--- a/src/vnet/adj/adj_l2.c
+++ b/src/vnet/adj/adj_l2.c
@@ -108,7 +108,7 @@ adj_l2_rewrite_inline (vlib_main_t * vm,
 			      adj0[0].rewrite_header.max_l3_packet_bytes)))
 	    {
 		/* Don't adjust the buffer for ttl issue; icmp-error node wants
-		 * to see the IP headerr */
+		 * to see the IP header */
 		p0->current_data -= rw_len0;
 		p0->current_length += rw_len0;
 		tx_sw_if_index0 = adj0[0].rewrite_header.sw_if_index;
diff --git a/src/vnet/adj/adj_mcast.c b/src/vnet/adj/adj_mcast.c
index 9fbad482600..4454afec630 100644
--- a/src/vnet/adj/adj_mcast.c
+++ b/src/vnet/adj/adj_mcast.c
@@ -95,7 +95,7 @@ adj_mcast_add_or_lock (fib_protocol_t proto,
  * adj_mcast_update_rewrite
  *
  * Update the adjacency's rewrite string. A NULL string implies the
- * rewirte is reset (i.e. when ARP/ND etnry is gone).
+ * rewrite is reset (i.e. when ARP/ND entry is gone).
  * NB: the adj being updated may be handling traffic in the DP.
  */
 void
@@ -129,7 +129,7 @@ adj_mcast_update_rewrite (adj_index_t adj_index,
  * adj_mcast_midchain_update_rewrite
  *
  * Update the adjacency's rewrite string. A NULL string implies the
- * rewirte is reset (i.e. when ARP/ND etnry is gone).
+ * rewrite is reset (i.e. when ARP/ND entry is gone).
  * NB: the adj being updated may be handling traffic in the DP.
  */
 void
@@ -148,7 +148,7 @@ adj_mcast_midchain_update_rewrite (adj_index_t adj_index,
     adj = adj_get(adj_index);
 
     /*
-     * one time only update. since we don't support chainging the tunnel
+     * one time only update. since we don't support changing the tunnel
      * src,dst, this is all we need.
      */
     ASSERT(adj->lookup_next_index == IP_LOOKUP_NEXT_MCAST);
diff --git a/src/vnet/adj/adj_midchain.c b/src/vnet/adj/adj_midchain.c
index a4b29c8ce35..f8a39494fb9 100644
--- a/src/vnet/adj/adj_midchain.c
+++ b/src/vnet/adj/adj_midchain.c
@@ -502,7 +502,7 @@ adj_midchain_setup (adj_index_t adj_index,
  * adj_nbr_midchain_update_rewrite
  *
  * Update the adjacency's rewrite string. A NULL string implies the
- * rewrite is reset (i.e. when ARP/ND etnry is gone).
+ * rewrite is reset (i.e. when ARP/ND entry is gone).
  * NB: the adj being updated may be handling traffic in the DP.
  */
 void
@@ -519,7 +519,7 @@ adj_nbr_midchain_update_rewrite (adj_index_t adj_index,
     adj = adj_get(adj_index);
 
     /*
-     * one time only update. since we don't support chainging the tunnel
+     * one time only update. since we don't support changing the tunnel
      * src,dst, this is all we need.
      */
     ASSERT((adj->lookup_next_index == IP_LOOKUP_NEXT_ARP) ||
@@ -534,7 +534,7 @@ adj_nbr_midchain_update_rewrite (adj_index_t adj_index,
     adj_midchain_setup(adj_index, fixup, fixup_data, flags);
 
     /*
-     * update the rewirte with the workers paused.
+     * update the rewrite with the workers paused.
      */
     adj_nbr_update_rewrite_internal(adj,
 				    IP_LOOKUP_NEXT_MIDCHAIN,
@@ -685,7 +685,7 @@ adj_ndr_midchain_recursive_loop_detect (adj_index_t ai,
         {
             /*
              * The entry this midchain links to is already in the set
-             * of visisted entries, this is a loop
+             * of visited entries, this is a loop
              */
             adj->ia_flags |= ADJ_FLAG_MIDCHAIN_LOOPED;
             return (1);
diff --git a/src/vnet/adj/adj_nbr.c b/src/vnet/adj/adj_nbr.c
index 3f73ff9f1d2..aa36b64f6bf 100644
--- a/src/vnet/adj/adj_nbr.c
+++ b/src/vnet/adj/adj_nbr.c
@@ -291,7 +291,7 @@ adj_nbr_add_or_lock_w_rewrite (fib_protocol_t nh_proto,
  * adj_nbr_update_rewrite
  *
  * Update the adjacency's rewrite string. A NULL string implies the
- * rewirte is reset (i.e. when ARP/ND etnry is gone).
+ * rewrite is reset (i.e. when ARP/ND etnry is gone).
  * NB: the adj being updated may be handling traffic in the DP.
  */
 void
@@ -333,7 +333,7 @@ adj_nbr_update_rewrite (adj_index_t adj_index,
  * adj_nbr_update_rewrite_internal
  *
  * Update the adjacency's rewrite string. A NULL string implies the
- * rewirte is reset (i.e. when ARP/ND etnry is gone).
+ * rewrite is reset (i.e. when ARP/ND etnry is gone).
  * NB: the adj being updated may be handling traffic in the DP.
  */
 void
@@ -357,7 +357,7 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj,
     {
         /*
          * The link type MPLS has no children in the control plane graph, it only
-         * has children in the data-palne graph. The backwalk is up the former.
+         * has children in the data-plane graph. The backwalk is up the former.
          * So we need to walk from its IP cousin.
          */
         walk_ai = adj_nbr_find(adj->ia_nh_proto,
@@ -394,7 +394,7 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj,
      * lock the adjacencies that are affected by updates this walk will provoke.
      * Since the aim of the walk is to update children to link to a different
      * DPO, this adj will no longer be in use and its lock count will drop to 0.
-     * We don't want it to be deleted as part of this endevour.
+     * We don't want it to be deleted as part of this endeavour.
      */
     adj_lock(adj_get_index(adj));
     adj_lock(walk_ai);
@@ -407,7 +407,7 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj,
      * ideally we would only want to suspend forwarding via this adj whilst we
      * do this, but we do not have that level of granularity - it's suspend all
      * worker threads or nothing.
-     * The other chioces are:
+     * The other choices are:
      *  - to mark the adj down and back walk so child load-balances drop this adj
      *    from the set.
      *  - update the next_node index of this adj to point to error-drop
@@ -418,7 +418,7 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj,
      * node. So from the options above, updating the next_node of the adj to
      * be drop will work, but it relies on each graph node v4/v6/mpls, rewrite/
      * arp/midchain always be valid w.r.t. a mis-match of adj type and node type
-     * (i.e. a rewrite adj in the arp node). This is not enforcable. Getting it
+     * (i.e. a rewrite adj in the arp node). This is not enforceable. Getting it
      * wrong will lead to hard to find bugs since its a race condition. So we
      * choose the more reliable method of updating the children to use the drop,
      * then switching adj's type, then updating the children again. Did I mention
@@ -440,7 +440,7 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj,
 	fib_node_back_walk_ctx_t bw_ctx = {
 	    .fnbw_reason = FIB_NODE_BW_REASON_FLAG_ADJ_DOWN,
             /*
-             * force this walk to be synchrous. if we don't and a node in the graph
+             * force this walk to be synchronous. if we don't and a node in the graph
              * (a heavily shared path-list) chooses to back-ground the walk (make it
              * async) then it will pause and we will do the adj update below, before
              * all the children are updated. not good.
@@ -484,7 +484,7 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj,
                                                         next_node);
 
     /*
-     * done with the rewirte update - let the workers loose.
+     * done with the rewrite update - let the workers loose.
      */
     vlib_worker_thread_barrier_release(vm);
 
diff --git a/src/vnet/adj/adj_nsh.c b/src/vnet/adj/adj_nsh.c
index 1a01471d8bc..19851b13b24 100644
--- a/src/vnet/adj/adj_nsh.c
+++ b/src/vnet/adj/adj_nsh.c
@@ -106,7 +106,7 @@ adj_nsh_rewrite_inline (vlib_main_t * vm,
                               adj0[0].rewrite_header.max_l3_packet_bytes)))
             {
                 /* Don't adjust the buffer for ttl issue; icmp-error node wants
-                 * to see the IP headerr */
+                 * to see the IP header */
                 p0->current_data -= rw_len0;
                 p0->current_length += rw_len0;
                 tx_sw_if_index0 = adj0[0].rewrite_header.sw_if_index;
diff --git a/src/vnet/bfd/bfd_api.c b/src/vnet/bfd/bfd_api.c
index ea6730fb8b9..118bba9aac8 100644
--- a/src/vnet/bfd/bfd_api.c
+++ b/src/vnet/bfd/bfd_api.c
@@ -417,7 +417,7 @@ vl_api_bfd_udp_get_echo_source_t_handler (vl_api_bfd_udp_get_echo_source_t *
 /*
  * bfd_api_hookup
  * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */
diff --git a/src/vnet/bier/bier_bit_string.c b/src/vnet/bier/bier_bit_string.c
index c22a24286e8..24546fa94c2 100644
--- a/src/vnet/bier/bier_bit_string.c
+++ b/src/vnet/bier/bier_bit_string.c
@@ -41,7 +41,7 @@ bier_bit_pos_is_valid (bier_bp_t bp,  const bier_bit_string_t *bbs)
 }
 
 /*
- * Validate a bit poistion
+ * Validate a bit position
  */
 #define BIER_BIT_POS_IS_VALID(_bp, _str)                                \
 {                                                                       \
diff --git a/src/vnet/bier/bier_disp_entry.c b/src/vnet/bier/bier_disp_entry.c
index 2df8314dc09..98508addfe0 100644
--- a/src/vnet/bier/bier_disp_entry.c
+++ b/src/vnet/bier/bier_disp_entry.c
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 /**
- * bier_dispositon : The BIER dispositon object
+ * bier_dispositon : The BIER disposition object
  *
- * A BIER dispositon object is present in the IP mcast output list
- * and represents the dispositon of a BIER bitmask. After BIER header
- * dispositon the packet is forward within the appropriate/specifid
+ * A BIER disposition object is present in the IP mcast output list
+ * and represents the disposition of a BIER bitmask. After BIER header
+ * disposition the packet is forward within the appropriate/specified
  * BIER table
  */
 
@@ -315,7 +315,7 @@ bier_disp_entry_dpo_unlock (dpo_id_t *dpo)
 static void
 bier_disp_entry_dpo_mem_show (void)
 {
-    fib_show_memory_usage("BIER dispositon",
+    fib_show_memory_usage("BIER disposition",
                           pool_elts(bier_disp_entry_pool),
                           pool_len(bier_disp_entry_pool),
                           sizeof(bier_disp_entry_t));
diff --git a/src/vnet/bier/bier_fmask.c b/src/vnet/bier/bier_fmask.c
index 1ca8a2e1df9..b6169d3c4bb 100644
--- a/src/vnet/bier/bier_fmask.c
+++ b/src/vnet/bier/bier_fmask.c
@@ -311,7 +311,7 @@ bier_fmask_link (index_t bfmi,
     if (0 == bfm->bfm_bits.bfmb_refs[BIER_BP_TO_INDEX(bp)])
     {
         /*
-         * 0 -> 1 transistion - set the bit in the string
+         * 0 -> 1 transition - set the bit in the string
          */
         bier_bit_string_set_bit(&bfm->bfm_bits.bfmb_input_reset_string, bp);
     }
@@ -334,7 +334,7 @@ bier_fmask_unlink (index_t bfmi,
     if (0 == bfm->bfm_bits.bfmb_refs[BIER_BP_TO_INDEX(bp)])
     {
         /*
-         * 1 -> 0 transistion - clear the bit in the string
+         * 1 -> 0 transition - clear the bit in the string
          */
         bier_bit_string_clear_bit(&bfm->bfm_bits.bfmb_input_reset_string, bp);
     }
diff --git a/src/vnet/bier/bier_fmask_db.c b/src/vnet/bier/bier_fmask_db.c
index 0ee1e5d6bf8..d0f5ba1c18e 100644
--- a/src/vnet/bier/bier_fmask_db.c
+++ b/src/vnet/bier/bier_fmask_db.c
@@ -25,7 +25,7 @@
  *
  * The table's key is part of this DB key, since the fmasks therein build up
  * their forwarding mask based on the routes that resolve through
- * it, so cross polination would be bad.
+ * it, so cross pollination would be bad.
  */
 typedef struct bier_fmask_db_t_ {
     /**
@@ -143,9 +143,9 @@ bier_fmask_db_remove (const bier_fmask_id_t *fmid)
 
     if (NULL == p) {
         /*
-         * remove a non-exitant entry - oops
+         * remove a non-existent entry - oops
          */
-        ASSERT (!"remove non-existant fmask");
+        ASSERT (!"remove non-existent fmask");
     } else {
         hash_unset(bier_fmask_db.bfdb_hash, fmid);
     }
diff --git a/src/vnet/bier/bier_imp.c b/src/vnet/bier/bier_imp.c
index 6150ea1c067..2da3f668cac 100644
--- a/src/vnet/bier/bier_imp.c
+++ b/src/vnet/bier/bier_imp.c
@@ -17,7 +17,7 @@
  *
  * A BIER imposition object is present in the IP mcast output list
  * and represents the imposition of a BIER bitmask. After BIER header
- * imposition the packet is forward within the appropriate/specifid
+ * imposition the packet is forward within the appropriate/specified
  * BIER table
  */
 
diff --git a/src/vnet/bier/bier_imp_node.c b/src/vnet/bier/bier_imp_node.c
index 5e3b3fb065f..727e92ec145 100644
--- a/src/vnet/bier/bier_imp_node.c
+++ b/src/vnet/bier/bier_imp_node.c
@@ -144,7 +144,7 @@ bier_imp_dpo_inline (vlib_main_t * vm,
 
                 /*
                  * use TTL 64 for the post enacp MPLS label/BIFT-ID
-                 * this we be decremeted in bier_output node.
+                 * this we be decremented in bier_output node.
                  */
                 vnet_buffer(b0)->mpls.ttl = 65;
 
diff --git a/src/vnet/bier/bier_input.c b/src/vnet/bier/bier_input.c
index dca990d07f6..d95df84ab11 100644
--- a/src/vnet/bier/bier_input.c
+++ b/src/vnet/bier/bier_input.c
@@ -107,7 +107,7 @@ bier_input (vlib_main_t * vm,
             bier_hdr_ntoh(bh0);
 
             /*
-             * In the MPLS decap node we squirelled away the
+             * In the MPLS decap node we squirrelled away the
              * index for the BIER table as the tx adjacency
              */
             bt_index0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
diff --git a/src/vnet/bier/bier_lookup.c b/src/vnet/bier/bier_lookup.c
index 51011c98008..c57c81d7aa9 100644
--- a/src/vnet/bier/bier_lookup.c
+++ b/src/vnet/bier/bier_lookup.c
@@ -22,7 +22,7 @@
 #include <vnet/bier/bier_fmask.h>
 
 /**
- * Struct maintining the per-worker thread data for BIER lookups
+ * Struct maintaining the per-worker thread data for BIER lookups
  */
 typedef struct bier_lookup_main_t_
 {
diff --git a/src/vnet/bier/bier_output.c b/src/vnet/bier/bier_output.c
index e2cf7d62cee..5c19103d6a3 100644
--- a/src/vnet/bier/bier_output.c
+++ b/src/vnet/bier/bier_output.c
@@ -26,7 +26,7 @@ static char * bier_output_error_strings[] = {
 };
 
 /*
- * Keep these values sematically the same as BIER output
+ * Keep these values semantically the same as BIER output
  */
 #define foreach_bier_output_next                \
     _(DROP, "bier-drop")
@@ -52,7 +52,7 @@ vlib_node_registration_t bier_output_node;
 extern vlib_combined_counter_main_t bier_fmask_counters;
 
 /**
- * @brief Packet trace recoed for a BIER output
+ * @brief Packet trace record for a BIER output
  */
 typedef struct bier_output_trace_t_
 {
@@ -109,7 +109,7 @@ bier_output (vlib_main_t * vm,
             bier_bit_string_init_from_hdr(bh0, &bbs);
 
             /*
-             * In the BIER Lookup node we squirelled away the
+             * In the BIER Lookup node we squirrelled away the
              * BIER fmask index as the adj index
              */
             bfmi0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
diff --git a/src/vnet/bier/bier_table.c b/src/vnet/bier/bier_table.c
index edfb754ecc1..a9f8a6d338f 100644
--- a/src/vnet/bier/bier_table.c
+++ b/src/vnet/bier/bier_table.c
@@ -251,7 +251,7 @@ bier_table_mk_lfib (bier_table_t *bt)
                                           FIB_SOURCE_BIER);
 
         /*
-         * stack the entry on the forwarding chain prodcued by the
+         * stack the entry on the forwarding chain produced by the
          * path-list via the ECMP tables.
          */
         fib_path_list_contribute_forwarding(bt->bt_pl,
@@ -309,7 +309,7 @@ bier_table_mk_ecmp (index_t bti)
     }
 
     /*
-     * no oppotunity to share, this the resolving ECMP tables are unique
+     * no opportunity to share, this the resolving ECMP tables are unique
      * to this table.
      * no need to be a child of the path list, we can do nothing with any
      * notifications it would generate [not that it will].
diff --git a/src/vnet/bonding/device.c b/src/vnet/bonding/device.c
index c3ff566681d..d333dfcc0d1 100644
--- a/src/vnet/bonding/device.c
+++ b/src/vnet/bonding/device.c
@@ -453,7 +453,7 @@ bond_hash_to_port (u32 * h, u32 n_left, u32 n_slaves, int use_modulo_shortcut)
   u32 mask = n_slaves - 1;
 
 #ifdef CLIB_HAVE_VEC256
-  /* only lower 16 bits of hash due to single precision fp arithmetics */
+  /* only lower 16 bits of hash due to single precision fp arithmetic */
   u32x8 mask8, sc8u, h8a, h8b;
   f32x8 sc8f;
 
@@ -672,7 +672,7 @@ VNET_DEVICE_CLASS_TX_FN (bond_dev_class) (vlib_main_t * vm,
 
   vlib_get_buffers (vm, from, bufs, n_left);
 
-  /* active-backup mode, ship everyting to first sw if index */
+  /* active-backup mode, ship everything to first sw if index */
   if ((bif->lb == BOND_LB_AB) || PREDICT_FALSE (n_slaves == 1))
     {
       sw_if_index = *vec_elt_at_index (bif->active_slaves, 0);
diff --git a/src/vnet/devices/af_packet/cli.c b/src/vnet/devices/af_packet/cli.c
index faa07287418..e5466c9599d 100644
--- a/src/vnet/devices/af_packet/cli.c
+++ b/src/vnet/devices/af_packet/cli.c
@@ -93,7 +93,7 @@ af_packet_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
 
   if (r == VNET_API_ERROR_SUBIF_ALREADY_EXISTS)
     {
-      error = clib_error_return (0, "Interface elready exists");
+      error = clib_error_return (0, "Interface already exists");
       goto done;
     }
 
diff --git a/src/vnet/dhcp/dhcp6_client_common_dp.c b/src/vnet/dhcp/dhcp6_client_common_dp.c
index a6ed42de578..d9e1fc7e2cc 100644
--- a/src/vnet/dhcp/dhcp6_client_common_dp.c
+++ b/src/vnet/dhcp/dhcp6_client_common_dp.c
@@ -186,10 +186,10 @@ dhcpv6_client_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 
 	  dhcpv60 = vlib_buffer_get_current (b0);
 	  ip0 = (void *) (b0->data + vnet_buffer (b0)->l3_hdr_offset);
-	  u32 dhcpv6_ip6_palyoad_offset =
+	  u32 dhcpv6_ip6_payload_offset =
 	    (u8 *) dhcpv60 - ((u8 *) ip0 + sizeof (*ip0));
 	  options_length =
-	    ntohs (ip0->payload_length) - dhcpv6_ip6_palyoad_offset -
+	    ntohs (ip0->payload_length) - dhcpv6_ip6_payload_offset -
 	    sizeof (*dhcpv60);
 
 	  clib_memset (&report, 0, sizeof (report));
diff --git a/src/vnet/dhcp/dhcp6_ia_na_client_dp.c b/src/vnet/dhcp/dhcp6_ia_na_client_dp.c
index 11abfccea76..5f940c33687 100644
--- a/src/vnet/dhcp/dhcp6_ia_na_client_dp.c
+++ b/src/vnet/dhcp/dhcp6_ia_na_client_dp.c
@@ -495,7 +495,7 @@ static uword
 dhcp6_reply_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
 		     vlib_frame_t * f)
 {
-  /* These cross the longjmp  boundry (vlib_process_wait_for_event)
+  /* These cross the longjmp  boundary (vlib_process_wait_for_event)
    * and need to be volatile - to prevent them from being optimized into
    * a register - which could change during suspension */
 
diff --git a/src/vnet/dhcp/dhcp6_pd_client_dp.c b/src/vnet/dhcp/dhcp6_pd_client_dp.c
index 9fb6096b8d5..bc6baf76293 100644
--- a/src/vnet/dhcp/dhcp6_pd_client_dp.c
+++ b/src/vnet/dhcp/dhcp6_pd_client_dp.c
@@ -501,7 +501,7 @@ static uword
 dhcp6_pd_reply_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
 			vlib_frame_t * f)
 {
-  /* These cross the longjmp  boundry (vlib_process_wait_for_event)
+  /* These cross the longjmp  boundary (vlib_process_wait_for_event)
    * and need to be volatile - to prevent them from being optimized into
    * a register - which could change during suspension */
 
diff --git a/src/vnet/dhcp/dhcp_api.c b/src/vnet/dhcp/dhcp_api.c
index cd30e1d2f94..c96c3e1e085 100644
--- a/src/vnet/dhcp/dhcp_api.c
+++ b/src/vnet/dhcp/dhcp_api.c
@@ -356,7 +356,7 @@ vl_api_dhcp_client_dump_t_handler (vl_api_dhcp_client_dump_t * mp)
 /*
  * dhcp_api_hookup
  * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */
diff --git a/src/vnet/dhcp/dhcp_client_detect.c b/src/vnet/dhcp/dhcp_client_detect.c
index 68f420d7c7c..c79970d1456 100644
--- a/src/vnet/dhcp/dhcp_client_detect.c
+++ b/src/vnet/dhcp/dhcp_client_detect.c
@@ -77,7 +77,7 @@ VLIB_NODE_FN (dhcp_client_detect_node) (vlib_main_t * vm,
       /*
        * This loop is optimised not so we can really quickly process DHCp
        * offers... but so we can quickly sift them out when the interface
-       * is also receving 'normal' packets
+       * is also receiving 'normal' packets
        */
       while (n_left_from >= 8 && n_left_to_next >= 4)
 	{
diff --git a/src/vnet/dns/dns.c b/src/vnet/dns/dns.c
index 7d52f751128..2951679eaa4 100644
--- a/src/vnet/dns/dns.c
+++ b/src/vnet/dns/dns.c
@@ -270,7 +270,7 @@ vnet_dns_send_dns4_request (dns_main_t * dm,
     }
 
   /* *INDENT-OFF* */
-  foreach_ip_interface_address(lm4, ia, sw_if_index, 1 /* honor unnummbered */,
+  foreach_ip_interface_address(lm4, ia, sw_if_index, 1 /* honor unnumbered */,
   ({
     src_address = ip_interface_address_get_address (lm4, ia);
     goto found_src_address;
@@ -378,7 +378,7 @@ vnet_dns_send_dns6_request (dns_main_t * dm,
   sw_if_index = fib_entry_get_resolving_interface (fei);
 
   /* *INDENT-OFF* */
-  foreach_ip_interface_address(lm6, ia, sw_if_index, 1 /* honor unnummbered */,
+  foreach_ip_interface_address(lm6, ia, sw_if_index, 1 /* honor unnumbered */,
   ({
     src_address = ip_interface_address_get_address (lm6, ia);
     goto found_src_address;
@@ -2852,7 +2852,7 @@ vnet_send_dns4_reply (dns_main_t * dm, dns_pending_request_t * pr,
     }
 
   /* *INDENT-OFF* */
-  foreach_ip_interface_address(lm4, ia, sw_if_index, 1 /* honor unnummbered */,
+  foreach_ip_interface_address(lm4, ia, sw_if_index, 1 /* honor unnumbered */,
   ({
     src_address = ip_interface_address_get_address (lm4, ia);
     goto found_src_address;
diff --git a/src/vnet/dpo/dpo.c b/src/vnet/dpo/dpo.c
index 83eb6f12c44..df78456bf60 100644
--- a/src/vnet/dpo/dpo.c
+++ b/src/vnet/dpo/dpo.c
@@ -18,7 +18,7 @@
  * applied to packets are they are switched through VPP.
  * 
  * The DPO is a base class that is specialised by other objects to provide
- * concreate actions
+ * concrete actions
  *
  * The VLIB graph nodes are graph of types, the DPO graph is a graph of instances.
  */
@@ -78,7 +78,7 @@ static const char* const * const ** dpo_nodes;
  * the third dimension in dpo_nodes is lost, hence, the edge index from each
  * node MUST be the same.
  * Including both the child and parent protocol is required to support the
- * case where it changes as the grapth is traversed, most notablly when an
+ * case where it changes as the graph is traversed, most notably when an
  * MPLS label is popped.
  *
  * Note that this array is child type specific, not child instance specific.
@@ -86,7 +86,7 @@ static const char* const * const ** dpo_nodes;
 static u32 ****dpo_edges;
 
 /**
- * @brief The DPO type value that can be assigend to the next dynamic
+ * @brief The DPO type value that can be assigned to the next dynamic
  *        type registration.
  */
 static dpo_type_t dpo_dynamic = DPO_LAST;
@@ -408,7 +408,7 @@ dpo_get_next_node (dpo_type_t child_type,
         parent_proto, ~0);
 
     /*
-     * if the edge index has not yet been created for this node to node transistion
+     * if the edge index has not yet been created for this node to node transition
      */
     if (~0 == dpo_edges[child_type][child_proto][parent_type][parent_proto])
     {
@@ -494,7 +494,7 @@ dpo_stack_i (u32 edge,
     dpo_copy(&tmp, parent);
 
     /*
-     * get the edge index for the parent to child VLIB graph transisition
+     * get the edge index for the parent to child VLIB graph transition
      */
     tmp.dpoi_next_node = edge;
 
diff --git a/src/vnet/dpo/drop_dpo.c b/src/vnet/dpo/drop_dpo.c
index 6bb3ff7d5e0..5c603e26d23 100644
--- a/src/vnet/dpo/drop_dpo.c
+++ b/src/vnet/dpo/drop_dpo.c
@@ -41,7 +41,7 @@ drop_dpo_lock (dpo_id_t *dpo)
     /*
      * not maintaining a lock count on the drop
      * more trouble than it's worth.
-     * There always needs to be one around. no point it managaing its lifetime
+     * There always needs to be one around. no point it managing its lifetime
      */
 }
 static void
diff --git a/src/vnet/ethernet/arp.c b/src/vnet/ethernet/arp.c
index 724cfa867c8..12c3fa47eac 100644
--- a/src/vnet/ethernet/arp.c
+++ b/src/vnet/ethernet/arp.c
@@ -520,7 +520,7 @@ arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
 	 * Complete the remaining fields of the adj's rewrite to direct the
 	 * complete of the rewrite at switch time by copying in the IP
 	 * dst address's bytes.
-	 * Ofset is 2 bytes into the MAC desintation address.
+	 * Offset is 2 bytes into the MAC destination address.
 	 */
 	adj_mcast_update_rewrite (ai, rewrite, offset);
 
@@ -1570,7 +1570,7 @@ vnet_arp_unset_ip4_over_ethernet (vnet_main_t * vnm,
 
 /**
  * @brief publish wildcard arp event
- * @param sw_if_index The interface on which the ARP entires are acted
+ * @param sw_if_index The interface on which the ARP entries are acted
  */
 static int
 vnet_arp_wc_publish (u32 sw_if_index,
@@ -2032,8 +2032,8 @@ vnet_proxy_arp_add_del (ip4_address_t * lo_addr,
 }
 
 /*
- * Remove any proxy arp entries asdociated with the
- * specificed fib.
+ * Remove any proxy arp entries associated with the
+ * specified fib.
  */
 int
 vnet_proxy_arp_fib_reset (u32 fib_id)
@@ -2614,7 +2614,7 @@ send_ip4_garp_w_addr (vlib_main_t * vm,
 }
 
 /*
- * Remove any arp entries asociated with the specificed interface
+ * Remove any arp entries associated with the specified interface
  */
 static clib_error_t *
 vnet_arp_delete_sw_interface (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
diff --git a/src/vnet/feature/feature.c b/src/vnet/feature/feature.c
index f1afa3746f0..47c8c62334f 100644
--- a/src/vnet/feature/feature.c
+++ b/src/vnet/feature/feature.c
@@ -132,7 +132,7 @@ vnet_feature_init (vlib_main_t * vm)
 
       features_in_order = fm->feature_nodes[arc_index];
 
-      /* If specificed, verify that the last node in the arc is actually last */
+      /* If specified, verify that the last node in the arc is actually last */
       if (areg->last_in_arc && vec_len (features_in_order) > 0)
 	{
 	  last_feature = features_in_order[vec_len (features_in_order) - 1];
diff --git a/src/vnet/fib/fib_api.c b/src/vnet/fib/fib_api.c
index ada0012ecd0..12c4f0de13f 100644
--- a/src/vnet/fib/fib_api.c
+++ b/src/vnet/fib/fib_api.c
@@ -71,7 +71,7 @@ fib_path_api_parse (const vl_api_fib_path_t *in,
     }
 
     /*
-     * the special INVALID label meams we are not recursing via a
+     * the special INVALID label means we are not recursing via a
      * label. Exp-null value is never a valid via-label so that
      * also means it's not a via-label and means clients that set
      * it to 0 by default get the expected behaviour
diff --git a/src/vnet/fib/fib_attached_export.c b/src/vnet/fib/fib_attached_export.c
index feb304bea36..da83a3d4184 100644
--- a/src/vnet/fib/fib_attached_export.c
+++ b/src/vnet/fib/fib_attached_export.c
@@ -28,7 +28,7 @@
 typedef struct fib_ae_import_t_
 {
     /**
-     * The entry in the epxort table that this importer
+     * The entry in the export table that this importer
      * is importing covereds from
      */
     fib_node_index_t faei_export_entry;
@@ -86,7 +86,7 @@ typedef struct fib_ae_export_t_ {
 } fib_ae_export_t;
 
 /*
- * memory pools for the importers and exportes
+ * memory pools for the importers and exporters
  */
 static fib_ae_import_t *fib_ae_import_pool;
 static fib_ae_export_t *fib_ae_export_pool;
@@ -136,7 +136,7 @@ fib_entry_import_remove (fib_ae_import_t *import,
     if (index < vec_len(import->faei_importeds))
     {
 	/*
-	 * this is an entry that was previsouly imported
+	 * this is an entry that was previously imported
 	 */
 	fib_table_entry_special_remove(import->faei_import_fib,
 				       fib_entry_get_prefix(entry_index),
@@ -245,7 +245,7 @@ fib_attached_export_import (fib_entry_t *fib_entry,
     fib_node_index_t fei;
 
     /*
-     * save index for later post-realloc retreival
+     * save index for later post-realloc retrieval
      */
     fei = fib_entry_get_index(fib_entry);
 
@@ -310,7 +310,7 @@ fib_attached_export_import (fib_entry_t *fib_entry,
 }
 
 /**
- * \brief All the imported entries need to be pruged
+ * \brief All the imported entries need to be purged
  */
 void
 fib_attached_export_purge (fib_entry_t *fib_entry)
diff --git a/src/vnet/fib/fib_entry.c b/src/vnet/fib/fib_entry.c
index a2e2a1e8085..edbfdf6e3a4 100644
--- a/src/vnet/fib/fib_entry.c
+++ b/src/vnet/fib/fib_entry.c
@@ -761,7 +761,7 @@ fib_entry_create_special (u32 fib_index,
     fib_entry_t *fib_entry;
 
     /*
-     * create and initiliase the new enty
+     * create and initialize the new enty
      */
     fib_entry = fib_entry_alloc(fib_index, prefix, &fib_entry_index);
 
@@ -1193,7 +1193,7 @@ fib_entry_special_remove (fib_node_index_t fib_entry_index,
 /**
  * fib_entry_inherit
  *
- * If the source on the cover is inherting then push this source
+ * If the source on the cover is inheriting then push this source
  * down to the covered.
  */
 void
@@ -1275,7 +1275,7 @@ fib_entry_cover_changed (fib_node_index_t fib_entry_index)
     fib_attached_export_cover_change(fib_entry);
 
     /*
-     * propagate the notificuation to each of the added sources
+     * propagate the notification to each of the added sources
      */
     index = 0;
     FOR_EACH_SRC_ADDED(fib_entry, esrc, source,
@@ -1349,7 +1349,7 @@ fib_entry_cover_updated (fib_node_index_t fib_entry_index)
     fib_attached_export_cover_update(fib_entry);
 
     /*
-     * propagate the notificuation to each of the added sources
+     * propagate the notification to each of the added sources
      */
     index = 0;
     FOR_EACH_SRC_ADDED(fib_entry, esrc, source,
@@ -1479,7 +1479,7 @@ fib_entry_is_host (fib_node_index_t fib_entry_index)
 }
 
 /**
- * Return !0 is the entry is reoslved, i.e. will return a valid forwarding
+ * Return !0 is the entry is resolved, i.e. will return a valid forwarding
  * chain
  */
 int
@@ -1552,9 +1552,9 @@ fib_ip4_address_compare (const ip4_address_t * a1,
                          const ip4_address_t * a2)
 {
     /*
-     * IP addresses are unsiged ints. the return value here needs to be signed
+     * IP addresses are unsigned ints. the return value here needs to be signed
      * a simple subtraction won't cut it.
-     * If the addresses are the same, the sort order is undefiend, so phoey.
+     * If the addresses are the same, the sort order is undefined, so phoey.
      */
     return ((clib_net_to_host_u32(a1->data_u32) >
 	     clib_net_to_host_u32(a2->data_u32) ) ?
diff --git a/src/vnet/fib/fib_entry_cover.c b/src/vnet/fib/fib_entry_cover.c
index ad12b94802a..c7308224f0a 100644
--- a/src/vnet/fib/fib_entry_cover.c
+++ b/src/vnet/fib/fib_entry_cover.c
@@ -63,7 +63,7 @@ fib_entry_cover_untrack (fib_entry_t* cover,
 }
 
 /**
- * Internal struct to hold user supplied paraneters for the cover walk
+ * Internal struct to hold user supplied parameters for the cover walk
  */
 typedef struct fib_enty_cover_walk_ctx_t_ {
     fib_entry_t *cover;
diff --git a/src/vnet/fib/fib_entry_src.c b/src/vnet/fib/fib_entry_src.c
index bc1ff2e068c..c6c2a04bed7 100644
--- a/src/vnet/fib/fib_entry_src.c
+++ b/src/vnet/fib/fib_entry_src.c
@@ -447,7 +447,7 @@ fib_entry_src_collect_forwarding (fib_node_index_t pl_index,
             /*
              * else
              *  the path does not refine the cover, meaning that
-             *  the adjacency doesdoes not match the sub-net on the link.
+             *  the adjacency does/does not match the sub-net on the link.
              *  So this path does not contribute forwarding.
              */
             break;
@@ -520,7 +520,7 @@ fib_entry_src_mk_lb (fib_entry_t *fib_entry,
 
     /*
      * As an optimisation we allocate the vector of next-hops to be sized
-     * equal to the maximum nuber of paths we will need, which is also the
+     * equal to the maximum number of paths we will need, which is also the
      * most likely number we will need, since in most cases the paths are 'up'.
      */
     vec_validate(ctx.next_hops, fib_path_list_get_n_paths(esrc->fes_pl));
@@ -809,7 +809,7 @@ fib_entry_src_covered_inherit_add_i (fib_entry_t *fib_entry,
             /*
              * the covered source is itself a COVERED_INHERIT, i.e.
              * it also pushes this source down the sub-tree.
-             * We consider this more specfic covered to be the owner
+             * We consider this more specific covered to be the owner
              * of the sub-tree from this point down.
              */
             return (FIB_TABLE_WALK_SUB_TREE_STOP);
@@ -827,7 +827,7 @@ fib_entry_src_covered_inherit_add_i (fib_entry_t *fib_entry,
         {
             /*
              * The covered's source was not inherited and it is also
-             * not inherting. Nevertheless, it still owns the sub-tree from 
+             * not inheriting. Nevertheless, it still owns the sub-tree from
              * this point down.
              */
             return (FIB_TABLE_WALK_SUB_TREE_STOP);
@@ -884,7 +884,7 @@ fib_entry_src_covered_inherit_walk_remove (fib_node_index_t fei,
             /*
              * the covered source is itself a COVERED_INHERIT, i.e.
              * it also pushes this source down the sub-tree.
-             * We consider this more specfic covered to be the owner
+             * We consider this more specific covered to be the owner
              * of the sub-tree from this point down.
              */
             return (FIB_TABLE_WALK_SUB_TREE_STOP);
@@ -905,7 +905,7 @@ fib_entry_src_covered_inherit_walk_remove (fib_node_index_t fei,
         {
             /*
              * The covered's source was not inherited and it is also
-             * not inherting. Nevertheless, it still owns the sub-tree from 
+             * not inheriting. Nevertheless, it still owns the sub-tree from
              * this point down.
              */
             return (FIB_TABLE_WALK_SUB_TREE_STOP);
diff --git a/src/vnet/fib/fib_entry_src_adj.c b/src/vnet/fib/fib_entry_src_adj.c
index 14bc1c4390e..816a1f46b48 100644
--- a/src/vnet/fib/fib_entry_src_adj.c
+++ b/src/vnet/fib/fib_entry_src_adj.c
@@ -290,7 +290,7 @@ fib_entry_src_adj_deactivate (fib_entry_src_t *src,
     fib_entry_t *cover;
 
     /*
-     * remove the depednecy on the covering entry
+     * remove the dependency on the covering entry
      */
     if (FIB_NODE_INDEX_INVALID == src->u.adj.fesa_cover)
     {
@@ -367,7 +367,7 @@ fib_entry_src_adj_cover_update (fib_entry_src_t *src,
 {
     /*
      * the cover has updated, i.e. its forwarding or flags
-     * have changed. don't decativate/activate here, since this
+     * have changed. don't deactivate/activate here, since this
      * prefix is updated during the covers walk.
      */
     fib_entry_src_cover_res_t res = {
diff --git a/src/vnet/fib/fib_entry_src_interface.c b/src/vnet/fib/fib_entry_src_interface.c
index 4ce4f14ab4e..5d609c5857a 100644
--- a/src/vnet/fib/fib_entry_src_interface.c
+++ b/src/vnet/fib/fib_entry_src_interface.c
@@ -61,8 +61,8 @@ fib_entry_src_interface_path_swap (fib_entry_src_t *src,
     src->fes_pl = fib_path_list_create(pl_flags, paths);
 
     /*
-     * this is a hack to get the entry's prefix into the glean adjacnecy
-     * so that it is available for fast retreival in the switch path.
+     * this is a hack to get the entry's prefix into the glean adjacency
+     * so that it is available for fast retrieval in the switch path.
      */
     if (!(FIB_ENTRY_FLAG_LOCAL & src->fes_entry_flags))
     {
@@ -125,7 +125,7 @@ fib_entry_src_interface_deactivate (fib_entry_src_t *src,
     fib_entry_t *cover;
 
     /*
-     * remove the depednecy on the covering entry
+     * remove the dependency on the covering entry
      */
     if (FIB_NODE_INDEX_INVALID != src->u.interface.fesi_cover)
     {
diff --git a/src/vnet/fib/fib_entry_src_interpose.c b/src/vnet/fib/fib_entry_src_interpose.c
index c362328f473..2220fa4debd 100644
--- a/src/vnet/fib/fib_entry_src_interpose.c
+++ b/src/vnet/fib/fib_entry_src_interpose.c
@@ -187,7 +187,7 @@ fib_entry_src_interpose_deactivate (fib_entry_src_t *src,
     if (FIB_NODE_INDEX_INVALID != src->u.interpose.fesi_cover)
     {
         /*
-         * remove the depednecy on the covering entry, if that's
+         * remove the dependency on the covering entry, if that's
          * what was contributing the path-list
          */
         cover = fib_entry_get(src->u.interpose.fesi_cover);
@@ -245,7 +245,7 @@ fib_entry_src_interpose_cover_change (fib_entry_src_t *src,
 
     /*
      * this function is called when this entry's cover has a more specific
-     * entry inserted benaeth it. That does not necessarily mean that this
+     * entry inserted beneath it. That does not necessarily mean that this
      * entry is covered by the new prefix. check that
      */
     if (src->u.interpose.fesi_cover !=
diff --git a/src/vnet/fib/fib_entry_src_mpls.c b/src/vnet/fib/fib_entry_src_mpls.c
index 32a620de713..f3d1dc0bd50 100644
--- a/src/vnet/fib/fib_entry_src_mpls.c
+++ b/src/vnet/fib/fib_entry_src_mpls.c
@@ -123,7 +123,7 @@ fib_entry_src_mpls_set_data (fib_entry_src_t *src,
             fib_index = mpls_fib_index_from_table_id(MPLS_FIB_DEFAULT_TABLE_ID);
 
             /*
-             * if this is a change in label, reomve the old one first
+             * if this is a change in label, remove the old one first
              */
             if (src->u.mpls.fesm_label != label)
             {
diff --git a/src/vnet/fib/fib_entry_src_rr.c b/src/vnet/fib/fib_entry_src_rr.c
index 63896c39c0f..9f4f68d88f5 100755
--- a/src/vnet/fib/fib_entry_src_rr.c
+++ b/src/vnet/fib/fib_entry_src_rr.c
@@ -79,7 +79,7 @@ fib_entry_src_rr_init (fib_entry_src_t *src)
  * and there would be 2 locks on the path-list; one since its used
  * by the cover, and 1 from here. The first lock will go when the
  * cover is removed, the second, and last, when the covered walk
- * occurs during the cover's removel - this is not a place where
+ * occurs during the cover's removal - this is not a place where
  * we can handle last lock gone.
  * In short, don't let the loop form. The usual rules of 'we must
  * let it form so we know when it breaks' don't apply here, since
@@ -175,7 +175,7 @@ fib_entry_src_rr_deactivate (fib_entry_src_t *src,
     fib_entry_t *cover;
 
     /*
-     * remove the depednecy on the covering entry
+     * remove the dependency on the covering entry
      */
     if (FIB_NODE_INDEX_INVALID != src->u.rr.fesr_cover)
     {
diff --git a/src/vnet/geneve/decap.c b/src/vnet/geneve/decap.c
index e5f5132a539..ac1369d6fd9 100644
--- a/src/vnet/geneve/decap.c
+++ b/src/vnet/geneve/decap.c
@@ -236,7 +236,7 @@ geneve_input (vlib_main_t * vm,
 		tunnel_index0 = last_tunnel_index;
 	      t0 = pool_elt_at_index (vxm->tunnels, tunnel_index0);
 
-	      /* Validate GENEVE tunnel encap-fib index agaist packet */
+	      /* Validate GENEVE tunnel encap-fib index against packet */
 	      if (PREDICT_FALSE (validate_geneve_fib (b0, t0, is_ip4) == 0))
 		{
 		  error0 = GENEVE_ERROR_NO_SUCH_TUNNEL;
@@ -290,7 +290,7 @@ geneve_input (vlib_main_t * vm,
 		tunnel_index0 = last_tunnel_index;
 	      t0 = pool_elt_at_index (vxm->tunnels, tunnel_index0);
 
-	      /* Validate GENEVE tunnel encap-fib index agaist packet */
+	      /* Validate GENEVE tunnel encap-fib index against packet */
 	      if (PREDICT_FALSE (validate_geneve_fib (b0, t0, is_ip4) == 0))
 		{
 		  error0 = GENEVE_ERROR_NO_SUCH_TUNNEL;
@@ -403,7 +403,7 @@ geneve_input (vlib_main_t * vm,
 		tunnel_index1 = last_tunnel_index;
 	      t1 = pool_elt_at_index (vxm->tunnels, tunnel_index1);
 
-	      /* Validate GENEVE tunnel encap-fib index agaist packet */
+	      /* Validate GENEVE tunnel encap-fib index against packet */
 	      if (PREDICT_FALSE (validate_geneve_fib (b1, t1, is_ip4) == 0))
 		{
 		  error1 = GENEVE_ERROR_NO_SUCH_TUNNEL;
@@ -459,7 +459,7 @@ geneve_input (vlib_main_t * vm,
 		tunnel_index1 = last_tunnel_index;
 	      t1 = pool_elt_at_index (vxm->tunnels, tunnel_index1);
 
-	      /* Validate GENEVE tunnel encap-fib index agaist packet */
+	      /* Validate GENEVE tunnel encap-fib index against packet */
 	      if (PREDICT_FALSE (validate_geneve_fib (b1, t1, is_ip4) == 0))
 		{
 		  error1 = GENEVE_ERROR_NO_SUCH_TUNNEL;
diff --git a/src/vnet/ip/ip6_neighbor.c b/src/vnet/ip/ip6_neighbor.c
index 649f4b7a4ba..86b1800c46c 100755
--- a/src/vnet/ip/ip6_neighbor.c
+++ b/src/vnet/ip/ip6_neighbor.c
@@ -4503,7 +4503,7 @@ ip6_neighbor_add_del_interface_address (ip6_main_t * im,
   ip6_radv_t *radv_info;
   ip6_address_t a;
 
-  /* create solicited node multicast address for this interface adddress */
+  /* create solicited node multicast address for this interface address */
   ip6_set_solicited_node_multicast_address (&a, 0);
 
   a.as_u8[0xd] = address->as_u8[0xd];
diff --git a/src/vnet/ip/ping.c b/src/vnet/ip/ping.c
index 2376d9a2f5b..e53d5b2acd2 100755
--- a/src/vnet/ip/ping.c
+++ b/src/vnet/ip/ping.c
@@ -26,7 +26,7 @@ ping_main_t ping_main;
  * @file
  * @brief IPv4 and IPv6 ICMP Ping.
  *
- * This file contains code to suppport IPv4 or IPv6 ICMP ECHO_REQUEST to
+ * This file contains code to support IPv4 or IPv6 ICMP ECHO_REQUEST to
  * network hosts.
  *
  */
diff --git a/src/vnet/pg/cli.c b/src/vnet/pg/cli.c
index 834ec48192e..4526986d1ff 100644
--- a/src/vnet/pg/cli.c
+++ b/src/vnet/pg/cli.c
@@ -163,7 +163,7 @@ format_pg_edit_group (u8 * s, va_list * va)
       while (*junk_after_name && *junk_after_name != ' ')
 	junk_after_name++;
       *junk_after_name = 0;
-      s = format (s, "edit-funtion %s, ", function_name);
+      s = format (s, "edit-function %s, ", function_name);
       vec_free (function_name);
     }
 
diff --git a/src/vnet/session-apps/echo_server.c b/src/vnet/session-apps/echo_server.c
index 941c16d0e08..ab90004de97 100644
--- a/src/vnet/session-apps/echo_server.c
+++ b/src/vnet/session-apps/echo_server.c
@@ -29,7 +29,7 @@ typedef struct
 
   u32 app_index;		/**< Server app index */
   u32 my_client_index;		/**< API client handle */
-  u32 node_index;		/**< process node index for evnt scheduling */
+  u32 node_index;		/**< process node index for event scheduling */
 
   /*
    * Config params
diff --git a/src/vnet/vxlan-gbp/decap.c b/src/vnet/vxlan-gbp/decap.c
index 39dac4169b4..7dc8d250f10 100644
--- a/src/vnet/vxlan-gbp/decap.c
+++ b/src/vnet/vxlan-gbp/decap.c
@@ -549,7 +549,7 @@ typedef enum
   IP_VXLAN_GBP_BYPASS_NEXT_DROP,
   IP_VXLAN_GBP_BYPASS_NEXT_VXLAN_GBP,
   IP_VXLAN_GBP_BYPASS_N_NEXT,
-} ip_vxan_gbp_bypass_next_t;
+} ip_vxlan_gbp_bypass_next_t;
 
 always_inline uword
 ip_vxlan_gbp_bypass_inline (vlib_main_t * vm,
diff --git a/src/vnet/vxlan-gpe/decap.c b/src/vnet/vxlan-gpe/decap.c
index b852704f6b4..8a36e0ad3bd 100644
--- a/src/vnet/vxlan-gpe/decap.c
+++ b/src/vnet/vxlan-gpe/decap.c
@@ -789,7 +789,7 @@ typedef enum
   IP_VXLAN_BYPASS_NEXT_DROP,
   IP_VXLAN_BYPASS_NEXT_VXLAN,
   IP_VXLAN_BYPASS_N_NEXT,
-} ip_vxan_bypass_next_t;
+} ip_vxlan_bypass_next_t;
 
 always_inline uword
 ip_vxlan_gpe_bypass_inline (vlib_main_t * vm,
diff --git a/src/vnet/vxlan/decap.c b/src/vnet/vxlan/decap.c
index efd718994c9..764dfca4820 100644
--- a/src/vnet/vxlan/decap.c
+++ b/src/vnet/vxlan/decap.c
@@ -457,7 +457,7 @@ typedef enum
   IP_VXLAN_BYPASS_NEXT_DROP,
   IP_VXLAN_BYPASS_NEXT_VXLAN,
   IP_VXLAN_BYPASS_N_NEXT,
-} ip_vxan_bypass_next_t;
+} ip_vxlan_bypass_next_t;
 
 always_inline uword
 ip_vxlan_bypass_inline (vlib_main_t * vm,