OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 57... Line 57...
57 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> 57 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
58 --- 58 ---
Line 59... Line 59...
59   59  
60 --- a/net/ipv4/netfilter/Kconfig 60 --- a/net/ipv4/netfilter/Kconfig
61 +++ b/net/ipv4/netfilter/Kconfig 61 +++ b/net/ipv4/netfilter/Kconfig
62 @@ -79,8 +79,9 @@ config NF_TABLES_ARP 62 @@ -78,8 +78,9 @@ config NF_TABLES_ARP
Line 63... Line 63...
63 endif # NF_TABLES 63 endif # NF_TABLES
64 64
65 config NF_FLOW_TABLE_IPV4 65 config NF_FLOW_TABLE_IPV4
Line 83... Line 83...
83 help 83 help
84 This option adds the flow table IPv6 support. 84 This option adds the flow table IPv6 support.
Line 85... Line 85...
85 85
86 --- a/net/netfilter/Kconfig 86 --- a/net/netfilter/Kconfig
87 +++ b/net/netfilter/Kconfig 87 +++ b/net/netfilter/Kconfig
88 @@ -675,8 +675,9 @@ endif # NF_TABLES_NETDEV 88 @@ -669,8 +669,9 @@ endif # NF_TABLES_NETDEV
Line 89... Line 89...
89 endif # NF_TABLES 89 endif # NF_TABLES
90 90
91 config NF_FLOW_TABLE_INET 91 config NF_FLOW_TABLE_INET
92 - select NF_FLOW_TABLE 92 - select NF_FLOW_TABLE
93 tristate "Netfilter flow table mixed IPv4/IPv6 module" 93 tristate "Netfilter flow table mixed IPv4/IPv6 module"
94 + depends on NF_FLOW_TABLE_IPV4 && NF_FLOW_TABLE_IPV6 94 + depends on NF_FLOW_TABLE_IPV4 && NF_FLOW_TABLE_IPV6
95 + select NF_FLOW_TABLE 95 + select NF_FLOW_TABLE
Line 96... Line 96...
96 help 96 help
Line 97... Line 97...
97 This option adds the flow table mixed IPv4/IPv6 support. 97 This option adds the flow table mixed IPv4/IPv6 support.
98 98
99 @@ -684,6 +685,7 @@ config NF_FLOW_TABLE_INET 99 @@ -678,6 +679,7 @@ config NF_FLOW_TABLE_INET
100 100