git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
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
f500b0f
..
e60b885
100644
(file)
--- a/
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
+++ b/
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
@@
-379,7
+379,7
@@
static const struct file_operations ct_cpu_seq_fops = {
.open = ct_cpu_seq_open,
.read = seq_read,
.llseek = seq_lseek,
- .release = seq_release
_private
,
+ .release = seq_release,
};
int __init nf_conntrack_ipv4_compat_init(void)