kernel: start working on 3.18 support
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.18 / 603-netfilter_layer7_2.6.36_fix.patch
1 --- a/net/netfilter/Kconfig
2 +++ b/net/netfilter/Kconfig
3 @@ -1175,6 +1175,27 @@ config NETFILTER_XT_MATCH_L2TP
4
5 To compile it as a module, choose M here. If unsure, say N.
6
7 +config NETFILTER_XT_MATCH_LAYER7
8 + tristate '"layer7" match support'
9 + depends on EXPERIMENTAL
10 + depends on NETFILTER_XTABLES
11 + depends on NETFILTER_ADVANCED
12 + depends on NF_CONNTRACK
13 + help
14 + Say Y if you want to be able to classify connections (and their
15 + packets) based on regular expression matching of their application
16 + layer data. This is one way to classify applications such as
17 + peer-to-peer filesharing systems that do not always use the same
18 + port.
19 +
20 + To compile it as a module, choose M here. If unsure, say N.
21 +
22 +config NETFILTER_XT_MATCH_LAYER7_DEBUG
23 + bool 'Layer 7 debugging output'
24 + depends on NETFILTER_XT_MATCH_LAYER7
25 + help
26 + Say Y to get lots of debugging output.
27 +
28 config NETFILTER_XT_MATCH_LENGTH
29 tristate '"length" match support'
30 depends on NETFILTER_ADVANCED
31 @@ -1369,26 +1390,11 @@ config NETFILTER_XT_MATCH_STATE
32
33 To compile it as a module, choose M here. If unsure, say N.
34
35 -config NETFILTER_XT_MATCH_LAYER7
36 - tristate '"layer7" match support'
37 - depends on NETFILTER_XTABLES
38 - depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
39 - depends on NETFILTER_ADVANCED
40 - help
41 - Say Y if you want to be able to classify connections (and their
42 - packets) based on regular expression matching of their application
43 - layer data. This is one way to classify applications such as
44 - peer-to-peer filesharing systems that do not always use the same
45 - port.
46 -
47 - To compile it as a module, choose M here. If unsure, say N.
48 -
49 config NETFILTER_XT_MATCH_LAYER7_DEBUG
50 - bool 'Layer 7 debugging output'
51 - depends on NETFILTER_XT_MATCH_LAYER7
52 - help
53 - Say Y to get lots of debugging output.
54 -
55 + bool 'Layer 7 debugging output'
56 + depends on NETFILTER_XT_MATCH_LAYER7
57 + help
58 + Say Y to get lots of debugging output.
59
60 config NETFILTER_XT_MATCH_STATISTIC
61 tristate '"statistic" match support'