[NETFILTER]: ctnetlink: fix compile failure with NF_CONNTRACK_MARK=n

  CC      net/netfilter/nf_conntrack_netlink.o
net/netfilter/nf_conntrack_netlink.c: In function 'ctnetlink_conntrack_event':
net/netfilter/nf_conntrack_netlink.c:392: error: 'struct nf_conn' has no member named 'mark'
make[3]: *** [net/netfilter/nf_conntrack_netlink.o] Error 1

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 4 insertions, 0 deletions

diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c
index 6f31fad9be13..7f70b0886b83 100644
--- a/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -374,9 +374,11 @@ static int ctnetlink_conntrack_event(struct notifier_block *this,
                     && ctnetlink_dump_helpinfo(skb, ct) < 0)
                         goto nfattr_failure;
 
+#ifdef CONFIG_IP_NF_CONNTRACK_MARK
                 if ((events & IPCT_MARK || ct->mark)
                     && ctnetlink_dump_mark(skb, ct) < 0)
                         goto nfattr_failure;
+#endif
 
                 if (events & IPCT_COUNTER_FILLING &&
                     (ctnetlink_dump_counters(skb, ct, IP_CT_DIR_ORIGINAL) < 0 ||
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 811e3e782f0f..c64f029f7052 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -389,9 +389,11 @@ static int ctnetlink_conntrack_event(struct notifier_block *this,
                     && ctnetlink_dump_helpinfo(skb, ct) < 0)
                         goto nfattr_failure;
 
+#ifdef CONFIG_NF_CONNTRACK_MARK
                 if ((events & IPCT_MARK || ct->mark)
                     && ctnetlink_dump_mark(skb, ct) < 0)
                         goto nfattr_failure;
+#endif
 
                 if (events & IPCT_COUNTER_FILLING &&
                     (ctnetlink_dump_counters(skb, ct, IP_CT_DIR_ORIGINAL) < 0 ||