浏览代码

[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>
Patrick McHardy 19 年之前
父节点
当前提交
c08de5d530
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      net/netfilter/Kconfig

+ 3 - 1
net/netfilter/Kconfig

@@ -209,7 +209,9 @@ config NETFILTER_XT_TARGET_SECMARK
 
 
 config NETFILTER_XT_TARGET_CONNSECMARK
 config NETFILTER_XT_TARGET_CONNSECMARK
 	tristate '"CONNSECMARK" target support'
 	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
 	help
 	  The CONNSECMARK target copies security markings from packets
 	  The CONNSECMARK target copies security markings from packets
 	  to connections, and restores security markings from connections
 	  to connections, and restores security markings from connections