Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

[pandora-kernel.git] / net / sched / Kconfig

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index a36270a..e318f45 100644 (file)
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -24,7 +24,7 @@ menuconfig NET_SCHED
          To administer these schedulers, you'll need the user-level utilities
          from the package iproute2+tc at <ftp://ftp.tux.org/pub/net/ip-routing/>.
          That package also contains some documentation; for more, check out
          To administer these schedulers, you'll need the user-level utilities
          from the package iproute2+tc at <ftp://ftp.tux.org/pub/net/ip-routing/>.
          That package also contains some documentation; for more, check out

-         <http://linux-net.osdl.org/index.php/Iproute2>.
+         <http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2>.

 
          This Quality of Service (QoS) support will enable you to use
          Differentiated Services (diffserv) and Resource Reservation Protocol
 
          This Quality of Service (QoS) support will enable you to use
          Differentiated Services (diffserv) and Resource Reservation Protocol


@@ -205,6 +205,18 @@ config NET_SCH_DRR
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config NET_SCH_MQPRIO
+       tristate "Multi-queue priority scheduler (MQPRIO)"
+       help
+         Say Y here if you want to use the Multi-queue Priority scheduler.
+         This scheduler allows QOS to be offloaded on NICs that have support
+         for offloading QOS schedulers.
+
+         To compile this driver as a module, choose M here: the module will
+         be called sch_mqprio.
+
+         If unsure, say N.
+

 config NET_SCH_INGRESS
        tristate "Ingress Qdisc"
        depends on NET_CLS_ACT
 config NET_SCH_INGRESS
        tristate "Ingress Qdisc"
        depends on NET_CLS_ACT


@@ -243,7 +255,7 @@ config NET_CLS_TCINDEX
 
 config NET_CLS_ROUTE4
        tristate "Routing decision (ROUTE)"
 
 config NET_CLS_ROUTE4
        tristate "Routing decision (ROUTE)"

-       select NET_CLS_ROUTE
+       select IP_ROUTE_CLASSID

        select NET_CLS
        ---help---
          If you say Y here, you will be able to classify packets
        select NET_CLS
        ---help---
          If you say Y here, you will be able to classify packets


@@ -252,9 +264,6 @@ config NET_CLS_ROUTE4
          To compile this code as a module, choose M here: the
          module will be called cls_route.
 
          To compile this code as a module, choose M here: the
          module will be called cls_route.
 

-config NET_CLS_ROUTE
-       bool
-

 config NET_CLS_FW
        tristate "Netfilter mark (FW)"
        select NET_CLS
 config NET_CLS_FW
        tristate "Netfilter mark (FW)"
        select NET_CLS