diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
| commit | 9e30c3705aed9fbec4c3304570e4d6e707856bcb (patch) | |
| tree | b19e6acb5a67af31a4e7742e05c2166dc3f1444c /net/sched | |
| parent | 72919904796333a20c6a5d5c380091b42e407aa9 (diff) | |
Merge with Linux 2.3.22.
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/Config.in | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/net/sched/Config.in b/net/sched/Config.in index 512f6eb4d..aeb2141bb 100644 --- a/net/sched/Config.in +++ b/net/sched/Config.in @@ -8,7 +8,7 @@ tristate 'CSZ packet scheduler' CONFIG_NET_SCH_CSZ #tristate 'H-PFQ packet scheduler' CONFIG_NET_SCH_HPFQ #tristate 'H-FSC packet scheduler' CONFIG_NET_SCH_HFCS if [ "$CONFIG_ATM" = "y" ]; then - bool 'ATM pseudo-scheduler' CONFIG_NET_SCH_ATM + bool 'ATM pseudo-scheduler' CONFIG_NET_SCH_ATM fi tristate 'The simplest PRIO pseudoscheduler' CONFIG_NET_SCH_PRIO tristate 'RED queue' CONFIG_NET_SCH_RED @@ -17,20 +17,20 @@ tristate 'TEQL queue' CONFIG_NET_SCH_TEQL tristate 'TBF queue' CONFIG_NET_SCH_TBF bool 'QoS support' CONFIG_NET_QOS if [ "$CONFIG_NET_QOS" = "y" ]; then - bool 'Rate estimator' CONFIG_NET_ESTIMATOR + bool ' Rate estimator' CONFIG_NET_ESTIMATOR fi bool 'Packet classifier API' CONFIG_NET_CLS if [ "$CONFIG_NET_CLS" = "y" ]; then - tristate 'Routing table based classifier' CONFIG_NET_CLS_ROUTE4 - if [ "$CONFIG_NET_CLS_ROUTE4" != "n" ]; then - define_bool CONFIG_NET_CLS_ROUTE y - fi - tristate 'Firewall based classifier' CONFIG_NET_CLS_FW - tristate 'U32 classifier' CONFIG_NET_CLS_U32 - if [ "$CONFIG_NET_QOS" = "y" ]; then - tristate 'Special RSVP classifier' CONFIG_NET_CLS_RSVP - tristate 'Special RSVP classifier for IPv6' CONFIG_NET_CLS_RSVP6 - bool 'Ingres traffic policing' CONFIG_NET_CLS_POLICE - fi + tristate ' Routing table based classifier' CONFIG_NET_CLS_ROUTE4 + if [ "$CONFIG_NET_CLS_ROUTE4" != "n" ]; then + define_bool CONFIG_NET_CLS_ROUTE y + fi + tristate ' Firewall based classifier' CONFIG_NET_CLS_FW + tristate ' U32 classifier' CONFIG_NET_CLS_U32 + if [ "$CONFIG_NET_QOS" = "y" ]; then + tristate ' Special RSVP classifier' CONFIG_NET_CLS_RSVP + tristate ' Special RSVP classifier for IPv6' CONFIG_NET_CLS_RSVP6 + bool ' Ingres traffic policing' CONFIG_NET_CLS_POLICE + fi fi |