OpenWrt – Diff between revs 2 and 3
?pathlinks?
Rev 2 | Rev 3 | |||
---|---|---|---|---|
Line 23... | Line 23... | |||
23 | Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> |
23 | Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> |
|
24 | --- |
24 | --- |
|
Line 25... | Line 25... | |||
25 | |
25 | |
|
26 | --- a/net/ipv4/netfilter/Kconfig |
26 | --- a/net/ipv4/netfilter/Kconfig |
|
27 | +++ b/net/ipv4/netfilter/Kconfig |
27 | +++ b/net/ipv4/netfilter/Kconfig |
|
Line 28... | Line 28... | |||
28 | @@ -80,8 +80,7 @@ endif # NF_TABLES |
28 | @@ -79,8 +79,7 @@ endif # NF_TABLES |
|
29 | |
29 | |
|
30 | config NF_FLOW_TABLE_IPV4 |
30 | config NF_FLOW_TABLE_IPV4 |
|
31 | tristate "Netfilter flow table IPv4 module" |
31 | tristate "Netfilter flow table IPv4 module" |
|
Line 47... | Line 47... | |||
47 | help |
47 | help |
|
48 | This option adds the flow table IPv6 support. |
48 | This option adds the flow table IPv6 support. |
|
Line 49... | Line 49... | |||
49 | |
49 | |
|
50 | --- a/net/netfilter/Kconfig |
50 | --- a/net/netfilter/Kconfig |
|
51 | +++ b/net/netfilter/Kconfig |
51 | +++ b/net/netfilter/Kconfig |
|
Line 52... | Line 52... | |||
52 | @@ -676,8 +676,8 @@ endif # NF_TABLES |
52 | @@ -670,8 +670,8 @@ endif # NF_TABLES |
|
53 | |
53 | |
|
54 | config NF_FLOW_TABLE_INET |
54 | config NF_FLOW_TABLE_INET |
|
55 | tristate "Netfilter flow table mixed IPv4/IPv6 module" |
55 | tristate "Netfilter flow table mixed IPv4/IPv6 module" |
|
56 | - depends on NF_FLOW_TABLE_IPV4 && NF_FLOW_TABLE_IPV6 |
56 | - depends on NF_FLOW_TABLE_IPV4 && NF_FLOW_TABLE_IPV6 |
|
57 | - select NF_FLOW_TABLE |
57 | - select NF_FLOW_TABLE |
|
58 | + depends on NF_FLOW_TABLE_IPV4 |
58 | + depends on NF_FLOW_TABLE_IPV4 |
|
59 | + depends on NF_FLOW_TABLE_IPV6 |
59 | + depends on NF_FLOW_TABLE_IPV6 |
|
Line 60... | Line 60... | |||
60 | help |
60 | help |
|
Line 61... | Line 61... | |||
61 | This option adds the flow table mixed IPv4/IPv6 support. |
61 | This option adds the flow table mixed IPv4/IPv6 support. |
|
62 | |
62 | |
|
63 | @@ -685,7 +685,9 @@ config NF_FLOW_TABLE_INET |
63 | @@ -679,7 +679,9 @@ config NF_FLOW_TABLE_INET |
|
64 | |
64 | |