From 9dac7b4d03beca19c29e232442928525095282d5 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 25 Aug 2005 16:23:11 -0700 Subject: [PATCH] --- yaml --- r: 6428 b: refs/heads/master c: 29cb9f9c5502f6218cd3ea574efe46a5e55522d2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/lib/Kconfig | 9 +-------- trunk/net/ipv4/netfilter/Kconfig | 1 + trunk/net/sched/Kconfig | 1 + 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 02fa6d2d2201..9938c7219299 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8082e4ed0a61da347f1c7f210493c4e9e55c8cd0 +refs/heads/master: 29cb9f9c5502f6218cd3ea574efe46a5e55522d2 diff --git a/trunk/lib/Kconfig b/trunk/lib/Kconfig index b62f685f797f..e43197efeb9c 100644 --- a/trunk/lib/Kconfig +++ b/trunk/lib/Kconfig @@ -73,14 +73,7 @@ config TEXTSEARCH_KMP tristate config TEXTSEARCH_BM - depends on TEXTSEARCH - tristate "Boyer-Moore" - help - Say Y here if you want to be able to search text using the - Boyer-Moore textsearch algorithm. - - To compile this code as a module, choose M here: the - module will be called ts_bm. + tristate config TEXTSEARCH_FSM tristate diff --git a/trunk/net/ipv4/netfilter/Kconfig b/trunk/net/ipv4/netfilter/Kconfig index f2bea6ecb226..c4213f3de505 100644 --- a/trunk/net/ipv4/netfilter/Kconfig +++ b/trunk/net/ipv4/netfilter/Kconfig @@ -415,6 +415,7 @@ config IP_NF_MATCH_STRING depends on IP_NF_IPTABLES select TEXTSEARCH select TEXTSEARCH_KMP + select TEXTSEARCH_BM select TEXTSEARCH_FSM help This option adds a `string' match, which allows you to look for diff --git a/trunk/net/sched/Kconfig b/trunk/net/sched/Kconfig index 59d3e71f8b85..45d3bc0812c8 100644 --- a/trunk/net/sched/Kconfig +++ b/trunk/net/sched/Kconfig @@ -491,6 +491,7 @@ config NET_EMATCH_TEXT depends on NET_EMATCH select TEXTSEARCH select TEXTSEARCH_KMP + select TEXTSEARCH_BM select TEXTSEARCH_FSM ---help--- Say Y here if you want to be ablt to classify packets based on