[MIPS] More vr41xx pt_regs fixups

[powerpc.git] / net / sched / Kconfig

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 55cd532..8298ea9 100644 (file)
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -44,7 +44,7 @@ if NET_SCHED
 
 choice
        prompt "Packet scheduler clock source"
 
 choice
        prompt "Packet scheduler clock source"

-       default NET_SCH_CLK_JIFFIES
+       default NET_SCH_CLK_GETTIMEOFDAY

        ---help---
          Packet schedulers need a monotonic clock that increments at a static
          rate. The kernel provides several suitable interfaces, each with
        ---help---
          Packet schedulers need a monotonic clock that increments at a static
          rate. The kernel provides several suitable interfaces, each with


@@ -305,7 +305,7 @@ config NET_CLS_U32
        tristate "Universal 32bit comparisons w/ hashing (U32)"
        select NET_CLS
        ---help---
        tristate "Universal 32bit comparisons w/ hashing (U32)"
        select NET_CLS
        ---help---

-         Say Y here to be able to classify packetes using a universal
+         Say Y here to be able to classify packets using a universal

          32bit pieces based comparison scheme.
 
          To compile this code as a module, choose M here: the
          32bit pieces based comparison scheme.
 
          To compile this code as a module, choose M here: the


@@ -411,7 +411,7 @@ config NET_EMATCH_META
        tristate "Metadata"
        depends on NET_EMATCH
        ---help---
        tristate "Metadata"
        depends on NET_EMATCH
        ---help---

-         Say Y here if you want to be ablt to classify packets based on
+         Say Y here if you want to be able to classify packets based on

          metadata such as load average, netfilter attributes, socket
          attributes and routing decisions.
 
          metadata such as load average, netfilter attributes, socket
          attributes and routing decisions.
 


@@ -434,7 +434,6 @@ config NET_EMATCH_TEXT
 
 config NET_CLS_ACT
        bool "Actions"
 
 config NET_CLS_ACT
        bool "Actions"

-       depends on EXPERIMENTAL

        select NET_ESTIMATOR
        ---help---
          Say Y here if you want to use traffic control actions. Actions
        select NET_ESTIMATOR
        ---help---
          Say Y here if you want to use traffic control actions. Actions


@@ -486,7 +485,7 @@ config NET_ACT_IPT
         tristate "IPtables targets"
         depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES
         ---help---
         tristate "IPtables targets"
         depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES
         ---help---

-         Say Y here to be able to invoke iptables targets after succesful
+         Say Y here to be able to invoke iptables targets after successful

          classification.
 
          To compile this code as a module, choose M here: the
          classification.
 
          To compile this code as a module, choose M here: the


@@ -538,8 +537,8 @@ config NET_ESTIMATOR
        ---help---
          Say Y here to allow using rate estimators to estimate the current
          rate-of-flow for network devices, queues, etc. This module is
        ---help---
          Say Y here to allow using rate estimators to estimate the current
          rate-of-flow for network devices, queues, etc. This module is

-         automaticaly selected if needed but can be selected manually for
-         statstical purposes.
+         automatically selected if needed but can be selected manually for
+         statistical purposes.

 
 endif # NET_SCHED
 
 
 endif # NET_SCHED