From 7e776266755136aad3eaff66bc9c3134e541cf10 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 Feb 2019 08:37:39 +0100
Subject: [PATCH] Squashed 'shared/n-acd/' changes from a409492679..9eb7bf7173

9eb7bf7173 trivial: fix spelling in code comments

git-subtree-dir: shared/n-acd
git-subtree-split: 9eb7bf717309fefb253d87e6a1af6660e977d791
---
 src/n-acd-bpf-fallback.c | 2 +-
 src/test-veth.c          | 2 +-
 src/util/timer.c         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/n-acd-bpf-fallback.c b/src/n-acd-bpf-fallback.c
index 5e6bdd0677..7270cfd9ff 100644
--- a/src/n-acd-bpf-fallback.c
+++ b/src/n-acd-bpf-fallback.c
@@ -1,7 +1,7 @@
 /*
  * A noop implementation of eBPF filter for IPv4 Address Conflict Detection
  *
- * These are a collection of dummy funcitons that have no effect, but allows
+ * These are a collection of dummy functions that have no effect, but allows
  * n-acd to compile without eBPF support.
  *
  * See n-acd-bpf.c for documentation.
diff --git a/src/test-veth.c b/src/test-veth.c
index 64724f5e9f..7e316ac42b 100644
--- a/src/test-veth.c
+++ b/src/test-veth.c
@@ -1,7 +1,7 @@
 /*
  * Test on a veth link
  *
- * This essentially mimics a real nework with two peers.
+ * This essentially mimics a real network with two peers.
  *
  * Run one ACD context on each end of the tunnel. On one end probe for N,
  * addresses on the other end pre-configure N/3 of the same addresses and probe
diff --git a/src/util/timer.c b/src/util/timer.c
index c995ba400f..29627af776 100644
--- a/src/util/timer.c
+++ b/src/util/timer.c
@@ -55,7 +55,7 @@ void timer_rearm(Timer *timer) {
 
         /*
          * A timeout value of 0 clears the timer, we sholud only set that if
-         * no timout exists in the tree.
+         * no timeout exists in the tree.
          */
 
         timeout = c_rbnode_entry(c_rbtree_first(&timer->tree), Timeout, node);