Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40e0cb00 authored Feb 02, 2007 by Patrick McHardy Committed by David S. Miller Feb 02, 2007

[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>

parent e47fddf2

net/ipv4/netfilter/ip_conntrack_netlink.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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 \|\|

net/netfilter/nf_conntrack_netlink.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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 \|\|