git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'r8169-for-jeff-20070919' of git://electric-eye.fr.zoreil.com/home/romie...
[sfrench/cifs-2.6.git]
/
net
/
netfilter
/
nf_conntrack_proto_generic.c
diff --git
a/net/netfilter/nf_conntrack_proto_generic.c
b/net/netfilter/nf_conntrack_proto_generic.c
index 6faf1bed72246951c02cc19c6aa549f5dc3caf7e..d8b501878d9fbf71f1c59fea03f748364fe52120 100644
(file)
--- a/
net/netfilter/nf_conntrack_proto_generic.c
+++ b/
net/netfilter/nf_conntrack_proto_generic.c
@@
-98,7
+98,7
@@
static struct ctl_table generic_compat_sysctl_table[] = {
#endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */
#endif /* CONFIG_SYSCTL */
-struct nf_conntrack_l4proto nf_conntrack_l4proto_generic =
+struct nf_conntrack_l4proto nf_conntrack_l4proto_generic
__read_mostly
=
{
.l3proto = PF_UNSPEC,
.l4proto = 0,