diff options
| author | Simon Horman <horms@verge.net.au> | 2011-01-12 20:29:21 -0500 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2011-01-12 20:29:21 -0500 |
| commit | fee1cc0895fd7bde875a86bbc3a1e82089e540b8 (patch) | |
| tree | df0a07a650229fd7aa775ca6c20a8d2939c96e72 /net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c | |
| parent | ae90bdeaeac6b964b7a1e853a90a19f358a9ac20 (diff) | |
| parent | 0c21e3aaf6ae85bee804a325aa29c325209180fd (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into HEAD
Diffstat (limited to 'net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c')
| -rw-r--r-- | net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c index ab9c05c9734..5585980fce2 100644 --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c | |||
| @@ -100,7 +100,7 @@ static int ct_show_secctx(struct seq_file *s, const struct nf_conn *ct) | |||
| 100 | 100 | ||
| 101 | ret = security_secid_to_secctx(ct->secmark, &secctx, &len); | 101 | ret = security_secid_to_secctx(ct->secmark, &secctx, &len); |
| 102 | if (ret) | 102 | if (ret) |
| 103 | return ret; | 103 | return 0; |
| 104 | 104 | ||
| 105 | ret = seq_printf(s, "secctx=%s ", secctx); | 105 | ret = seq_printf(s, "secctx=%s ", secctx); |
| 106 | 106 | ||