summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2005-06-24 17:39:03 -0700
committerDavid S. Miller <davem@davemloft.net>2005-06-24 17:39:03 -0700
commitf7704347a74fceaf79c89f8b8dbdd0111013e4d6 (patch)
tree96cdf098692ee1054ca75af546b9cc720f07a7a1
parentb3e112bcc19abd8e9657dca34a87316786e096f3 (diff)
downloadlinux-sh-f7704347a74fceaf79c89f8b8dbdd0111013e4d6.tar.gz
[PKT_SCHED]: Make TEXTSEARCH* options only selected.
Do not present these confusing new options to the user unless he picked some facility that makes use of it, such as NET_EMATCH_TEXT. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--lib/Kconfig28
-rw-r--r--net/sched/Kconfig5
2 files changed, 9 insertions, 24 deletions
diff --git a/lib/Kconfig b/lib/Kconfig
index 455833a9e31a..eeb429a52152 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -63,32 +63,16 @@ config REED_SOLOMON_ENC16
config REED_SOLOMON_DEC16
boolean
+#
+# Textsearch support is select'ed if needed
+#
config TEXTSEARCH
- boolean "Textsearch infrastructure"
- default y
- help
- Say Y here if you want to provide a textsearch infrastructure
- to other subsystems.
+ boolean
config TEXTSEARCH_KMP
- depends on TEXTSEARCH
- tristate "Knuth-Morris-Pratt"
- help
- Say Y here if you want to be able to search text using the
- Knuth-Morris-Pratt textsearch algorithm.
-
- To compile this code as a module, choose M here: the
- module will be called ts_kmp.
+ tristate
config TEXTSEARCH_FSM
- depends on TEXTSEARCH
- tristate "Finite state machine"
- help
- Say Y here if you want to be able to search text using a
- naive finite state machine approach implementing a subset
- of regular expressions.
-
- To compile this code as a module, choose M here: the
- module will be called ts_fsm.
+ tristate
endmenu
diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 447b89e556b1..7bac249258e3 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -453,10 +453,11 @@ config NET_EMATCH_TEXT
tristate "Textsearch"
depends on NET_EMATCH
select TEXTSEARCH
+ select TEXTSEARCH_KMP
+ select TEXTSEARCH_FSM
---help---
Say Y here if you want to be ablt to classify packets based on
- textsearch comparisons. Please select the appropriate textsearch
- algorithms in the Library section.
+ textsearch comparisons.
To compile this code as a module, choose M here: the
module will be called em_text.