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

Commit bcd1e830 authored Apr 01, 2006 by Martin Josefsson Committed by David S. Miller Apr 01, 2006

[NETFILTER]: fix ifdef for connmark support in nf_conntrack_netlink



When ctnetlink was ported from ip_conntrack to nf_conntrack two #ifdef's
for connmark support were left unchanged and this code was never
compiled.

Problem noticed by Daniel De Graaf.

Signed-off-by: Martin Josefsson <gandalf@wlug.westbo.se>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a89ecb6a

net/netfilter/nf_conntrack_netlink.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1022,7 +1022,7 @@ ctnetlink_change_conntrack(struct nf_conn ct, struct nfattr cda[])
		return err;
		}

		#if defined(CONFIG_IP_NF_CONNTRACK_MARK)
		#if defined(CONFIG_NF_CONNTRACK_MARK)
		if (cda[CTA_MARK-1])
		ct->mark = ntohl((u_int32_t )NFA_DATA(cda[CTA_MARK-1]));
		#endif
		@@ -1062,7 +1062,7 @@ ctnetlink_create_conntrack(struct nfattr *cda[],
		return err;
		}

		#if defined(CONFIG_IP_NF_CONNTRACK_MARK)
		#if defined(CONFIG_NF_CONNTRACK_MARK)
		if (cda[CTA_MARK-1])
		ct->mark = ntohl((u_int32_t )NFA_DATA(cda[CTA_MARK-1]));
		#endif