From 9eb44592234f56ca5454043034098718e24da478 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Tue, 19 Oct 2010 18:17:32 -0400 Subject: [PATCH] --- yaml --- r: 211686 b: refs/heads/master c: ff660c80d00b52287f1f67ee6c115dc0057bcdde h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/netfilter/nf_conntrack_netlink.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5de60898bd13..85b3c11453ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 845ca30fe9691f1bab7cfbf30b6d11c944eb4abd +refs/heads/master: ff660c80d00b52287f1f67ee6c115dc0057bcdde diff --git a/trunk/net/netfilter/nf_conntrack_netlink.c b/trunk/net/netfilter/nf_conntrack_netlink.c index b3c628555cf3..146476c6441a 100644 --- a/trunk/net/netfilter/nf_conntrack_netlink.c +++ b/trunk/net/netfilter/nf_conntrack_netlink.c @@ -582,9 +582,11 @@ ctnetlink_conntrack_event(unsigned int events, struct nf_ct_event *item) && ctnetlink_dump_helpinfo(skb, ct) < 0) goto nla_put_failure; +#ifdef CONFIG_NF_CONNTRACK_SECMARK if ((events & (1 << IPCT_SECMARK) || ct->secmark) && ctnetlink_dump_secctx(skb, ct) < 0) goto nla_put_failure; +#endif if (events & (1 << IPCT_RELATED) && ctnetlink_dump_master(skb, ct) < 0)