diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-10-12 14:08:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-10-15 23:14:09 -0700 |
| commit | c08de5d5308ae0d20290344551ddd9cea8ded661 (patch) | |
| tree | 974fe46f0f6a3f9f9eaad58fe5a8e2abd9443e2d /net | |
| parent | a9f54596fa20be3edefaa0b24c8714edb945eeaa (diff) | |
| download | kernel_samsung_tuna-c08de5d5308ae0d20290344551ddd9cea8ded661.zip kernel_samsung_tuna-c08de5d5308ae0d20290344551ddd9cea8ded661.tar.gz kernel_samsung_tuna-c08de5d5308ae0d20290344551ddd9cea8ded661.tar.bz2 | |
[NETFILTER]: xt_CONNSECMARK: fix Kconfig dependencies
CONNSECMARK needs conntrack, add missing dependency to fix linking error
with CONNSECMARK=y and CONNTRACK=m.
Reported by Toralf Förster <toralf.foerster@gmx.de>.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index ce94732..f619c65 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -209,7 +209,9 @@ config NETFILTER_XT_TARGET_SECMARK config NETFILTER_XT_TARGET_CONNSECMARK tristate '"CONNSECMARK" target support' - depends on NETFILTER_XTABLES && (NF_CONNTRACK_SECMARK || IP_NF_CONNTRACK_SECMARK) + depends on NETFILTER_XTABLES && \ + ((NF_CONNTRACK && NF_CONNTRACK_SECMARK) || \ + (IP_NF_CONNTRACK && IP_NF_CONNTRACK_SECMARK)) help The CONNSECMARK target copies security markings from packets to connections, and restores security markings from connections |