summaryrefslogtreecommitdiff
path: root/nest
diff options
context:
space:
mode:
Diffstat (limited to 'nest')
-rw-r--r--nest/cli.c2
-rw-r--r--nest/proto-hooks.c2
-rw-r--r--nest/proto.c4
-rw-r--r--nest/rt-attr.c12
-rw-r--r--nest/rt-dev.c2
-rw-r--r--nest/rt-table.c6
6 files changed, 14 insertions, 14 deletions
diff --git a/nest/cli.c b/nest/cli.c
index dd7e4fa9..30ac7510 100644
--- a/nest/cli.c
+++ b/nest/cli.c
@@ -36,7 +36,7 @@
*
* The CLI commands are declared as a part of the configuration grammar
* by using the |CF_CLI| macro. When a command is received, it's processed
- * by the same lexical analyser and parser as used for the configuration, but
+ * by the same lexical analyzer and parser as used for the configuration, but
* it's switched to a special mode by prepending a fake token to the text,
* so that it uses only the CLI command rules. Then the parser invokes
* an execution routine corresponding to the command, which either constructs
diff --git a/nest/proto-hooks.c b/nest/proto-hooks.c
index 5df52297..29be6972 100644
--- a/nest/proto-hooks.c
+++ b/nest/proto-hooks.c
@@ -212,7 +212,7 @@ void neigh_notify(neighbor *neigh)
* to convert the protocol attributes embedded directly in the &rte
* to temporary extended attributes in order to distribute them
* to other protocols or to filters. make_tmp_attrs() creates
- * an &ea_list in the linpool @pool, fills it with values of the
+ * an &ea_list in the linear pool @pool, fills it with values of the
* temporary attributes and returns a pointer to it.
*/
ea_list *make_tmp_attrs(rte *e, struct linpool *pool)
diff --git a/nest/proto.c b/nest/proto.c
index 82756384..54fb3bf8 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -93,7 +93,7 @@ proto_relink(struct proto *p)
* with data specific to the protocol)
*
* When a new configuration has been read in, the core code starts
- * initializing all the protocol instandces configured by calling their
+ * initializing all the protocol instances configured by calling their
* init() hooks with the corresponding instance configuration. The initialization
* code of the protocol is expected to create a new instance according to the
* configuration by calling this function and then modifying the default settings
@@ -456,7 +456,7 @@ protos_dump_all(void)
*
* After the platform specific initialization code uses protos_build()
* to add all the standard protocols, it should call proto_build() for
- * all platform specific protocols to infrom the core that they exist.
+ * all platform specific protocols to inform the core that they exist.
*/
void
proto_build(struct protocol *p)
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 6b6183fd..8259877c 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -21,7 +21,7 @@
* dynamic attributes represented by a linked list of &ea_list
* structures, each of them consisting of an array of &eattr's containing
* the individual attributes. An attribute can be specified more than once
- * in the &ea_list chain and in such case the first occurence overrides
+ * in the &ea_list chain and in such case the first occurrence overrides
* the others. This semantics is used especially when someone (for example
* a filter) wishes to alter values of several dynamic attributes, but
* it wants to preserve the original attribute lists maintained by
@@ -33,7 +33,7 @@
* embedded 32-bit value or a pointer to a &adata structure holding attribute
* contents.
*
- * There exist two variants of &rta's -- cached and uncached ones. Uncached
+ * There exist two variants of &rta's -- cached and un-cached ones. Un-cached
* &rta's can have arbitrarily complex structure of &ea_list's and they
* can be modified by any module in the route processing chain. Cached
* &rta's have their attribute lists normalized (that means at most one
@@ -103,7 +103,7 @@ ea__find(ea_list *e, unsigned id)
* @id: attribute ID to search for
*
* Given an extended attribute list, ea_find() searches for a first
- * occurence of an attribute with specified ID, returning either a pointer
+ * occurrence of an attribute with specified ID, returning either a pointer
* to its &eattr structure or %NULL if no such attribute exists.
*/
eattr *
@@ -214,7 +214,7 @@ ea_do_prune(ea_list *e)
* within each of its entries.
*
* If an attribute occurs multiple times in a single &ea_list,
- * ea_sort() leaves only the first (the only significant) occurence.
+ * ea_sort() leaves only the first (the only significant) occurrence.
*/
void
ea_sort(ea_list *e)
@@ -637,9 +637,9 @@ rta_rehash(void)
/**
* rta_lookup - look up a &rta in attribute cache
- * @o: a uncached &rta
+ * @o: a un-cached &rta
*
- * rta_lookup() gets an uncached &rta structure and returns its cached
+ * rta_lookup() gets an un-cached &rta structure and returns its cached
* counterpart. It starts with examining the attribute cache to see whether
* there exists a matching entry. If such an entry exists, it's returned and
* its use count is incremented, else a new entry is created with use count
diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index 031c245c..269346de 100644
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -9,7 +9,7 @@
/**
* DOC: Direct
*
- * The Direct protocol works by convering all ifa_notify() events it receives
+ * The Direct protocol works by converting all ifa_notify() events it receives
* to rte_update() calls for the corresponding network.
*/
diff --git a/nest/rt-table.c b/nest/rt-table.c
index de4d4f58..51da7366 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -80,7 +80,7 @@ rte_find(net *net, struct proto *p)
/**
* rte_get_temp - get a temporary &rte
* @a: attributes to assign to the new route (a &rta; in case it's
- * uncached, rte_update() will create a cached copy automatically)
+ * un-cached, rte_update() will create a cached copy automatically)
*
* Create a temporary &rte and bind it with the attributes @a.
* Also set route preference to the default preference set for
@@ -447,7 +447,7 @@ rte_update_unlock(void)
*
* This function is called by the routing protocols whenever they discover
* a new route or wish to update/remove an existing route. The right announcement
- * sequence is to build route attributes first (either uncached with @aflags set
+ * sequence is to build route attributes first (either un-cached with @aflags set
* to zero or a cached one using rta_lookup(); in this case please note that
* you need to increase the use count of the attributes yourself by calling
* rta_clone()), call rte_get_temp() to obtain a temporary &rte, fill in all
@@ -1125,7 +1125,7 @@ static inline net *net_get(rtable *tab, ip_addr addr, unsigned len)
* shared with anyone else (and especially that it isn't stored in any routing
* table).
*
- * Result: a pointer to the new writeable &rte.
+ * Result: a pointer to the new writable &rte.
*/
static inline rte * rte_cow(rte *r)
{ DUMMY; }