projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[cascardo/linux.git]
/
net
/
ipv4
/
netfilter
/
nf_conntrack_l3proto_ipv4_compat.c
diff --git
a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
index
37f8adb
..
63f60fc
100644
(file)
--- a/
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
+++ b/
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
@@
-97,7
+97,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);