Merge remote-tracking branch 'origin/master' into devel-11

4 files changed, 5 insertions, 5 deletions

diff --git a/sys/net/altq/altq_cbq.c b/sys/net/altq/altq_cbq.c
index a51a21f..56c14d3 100644
--- a/sys/net/altq/altq_cbq.c
+++ b/sys/net/altq/altq_cbq.c
@@ -701,7 +701,7 @@ cbq_modify_class(acp)
  *		struct rm_class *parent, struct rm_class *borrow)
  *
  * This function create a new traffic class in the CBQ class hierarchy of
- * given paramters.  The class that created is either the root, default,
+ * given parameters.  The class that created is either the root, default,
  * or a new dynamic class.  If CBQ is not initilaized, the the root class
  * will be created.
  */
diff --git a/sys/net/altq/altq_red.c b/sys/net/altq/altq_red.c
index 1347851..9d75460 100644
--- a/sys/net/altq/altq_red.c
+++ b/sys/net/altq/altq_red.c
@@ -158,7 +158,7 @@
 #define	TH_MIN		5	/* min threshold */
 #define	TH_MAX		15	/* max threshold */
 
-#define	RED_LIMIT	60	/* default max queue lenght */
+#define	RED_LIMIT	60	/* default max queue length */
 #define	RED_STATS		/* collect statistics */
 
 /*
@@ -171,7 +171,7 @@
 #ifdef ALTQ3_COMPAT
 #ifdef ALTQ_FLOWVALVE
 /*
- * flow-valve is an extention to protect red from unresponsive flows
+ * flow-valve is an extension to protect red from unresponsive flows
  * and to promote end-to-end congestion control.
  * flow-valve observes the average drop rates of the flows that have
  * experienced packet drops in the recent past.
diff --git a/sys/net/altq/altq_rio.c b/sys/net/altq/altq_rio.c
index 0f19735e..7687701 100644
--- a/sys/net/altq/altq_rio.c
+++ b/sys/net/altq/altq_rio.c
@@ -146,7 +146,7 @@
 #define	TH_MIN		 5	/* min threshold */
 #define	TH_MAX		15	/* max threshold */
 
-#define	RIO_LIMIT	60	/* default max queue lenght */
+#define	RIO_LIMIT	60	/* default max queue length */
 #define	RIO_STATS		/* collect statistics */
 
 #define	TV_DELTA(a, b, delta) {					\
diff --git a/sys/net/altq/altq_rmclass.h b/sys/net/altq/altq_rmclass.h
index d511714..6130c4f 100644
--- a/sys/net/altq/altq_rmclass.h
+++ b/sys/net/altq/altq_rmclass.h
@@ -188,7 +188,7 @@ struct rm_class {
  */
 struct rm_ifdat {
 	int		queued_;	/* # pkts queued downstream */
-	int		efficient_;	/* Link Efficency bit */
+	int		efficient_;	/* Link Efficiency bit */
 	int		wrr_;		/* Enable Weighted Round-Robin */
 	u_long		ns_per_byte_;	/* Link byte speed. */
 	int		maxqueued_;	/* Max packets to queue */