diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2010-10-18 05:13:30 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-10-18 05:13:30 -0400 |
| commit | 76b6717bc6ccb715b04e36efc26566a6313ede5f (patch) | |
| tree | eecbb09c5775cd3f092cc91e5f15c251c25d3b82 | |
| parent | a91fd267e327ca7599654b4e9ed7b62c5adaccee (diff) | |
netfilter: fix kconfig unmet dependency warning
Fix netfilter kconfig unmet dependencies warning & spell out
"compatible" while there.
warning: (IP_NF_TARGET_TTL && NET && INET && NETFILTER && IP_NF_IPTABLES && NETFILTER_ADVANCED || IP6_NF_TARGET_HL && NET && INET && IPV6 && NETFILTER && IP6_NF_IPTABLES && NETFILTER_ADVANCED) selects NETFILTER_XT_TARGET_HL which has unmet direct dependencies ((IP_NF_MANGLE || IP6_NF_MANGLE) && NETFILTER_ADVANCED)
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
| -rw-r--r-- | net/ipv4/netfilter/Kconfig | 4 | ||||
| -rw-r--r-- | net/ipv6/netfilter/Kconfig | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index 1833bdbf9805..8e3350643b63 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig | |||
| @@ -324,10 +324,10 @@ config IP_NF_TARGET_ECN | |||
| 324 | 324 | ||
| 325 | config IP_NF_TARGET_TTL | 325 | config IP_NF_TARGET_TTL |
| 326 | tristate '"TTL" target support' | 326 | tristate '"TTL" target support' |
| 327 | depends on NETFILTER_ADVANCED | 327 | depends on NETFILTER_ADVANCED && IP_NF_MANGLE |
| 328 | select NETFILTER_XT_TARGET_HL | 328 | select NETFILTER_XT_TARGET_HL |
| 329 | ---help--- | 329 | ---help--- |
| 330 | This is a backwards-compat option for the user's convenience | 330 | This is a backwards-compatible option for the user's convenience |
| 331 | (e.g. when running oldconfig). It selects | 331 | (e.g. when running oldconfig). It selects |
| 332 | CONFIG_NETFILTER_XT_TARGET_HL. | 332 | CONFIG_NETFILTER_XT_TARGET_HL. |
| 333 | 333 | ||
diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig index 29d643bcafa4..44d2eeac089b 100644 --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig | |||
| @@ -132,10 +132,10 @@ config IP6_NF_MATCH_RT | |||
| 132 | # The targets | 132 | # The targets |
| 133 | config IP6_NF_TARGET_HL | 133 | config IP6_NF_TARGET_HL |
| 134 | tristate '"HL" hoplimit target support' | 134 | tristate '"HL" hoplimit target support' |
| 135 | depends on NETFILTER_ADVANCED | 135 | depends on NETFILTER_ADVANCED && IP6_NF_MANGLE |
| 136 | select NETFILTER_XT_TARGET_HL | 136 | select NETFILTER_XT_TARGET_HL |
| 137 | ---help--- | 137 | ---help--- |
| 138 | This is a backwards-compat option for the user's convenience | 138 | This is a backwards-compatible option for the user's convenience |
| 139 | (e.g. when running oldconfig). It selects | 139 | (e.g. when running oldconfig). It selects |
| 140 | CONFIG_NETFILTER_XT_TARGET_HL. | 140 | CONFIG_NETFILTER_XT_TARGET_HL. |
| 141 | 141 | ||
