Merge branch 'batman-adv/merge' of git://git.open-mesh.org/ecsv/linux-merge

[~andy/linux] / net / netfilter / nf_conntrack_standalone.c

diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 0fb65705b44b522e3ba4de6c02d06f119f43f2d9..b4d7f0f24b27e9534a97851e7830714c8135a7bf 100644 (file)
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -118,7 +118,7 @@ static int ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)
 
        ret = security_secid_to_secctx(ct->secmark, &secctx, &len);
        if (ret)
-               return ret;
+               return 0;
 
        ret = seq_printf(s, "secctx=%s ", secctx);