diff options
| author |   Gao feng <gaofeng@cn.fujitsu.com> | 2012-06-21 04:36:39 +0000 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2012-06-27 18:31:14 +0200 |
| commit | f1caad274515ffd9841ac57ce9a7b5fc35bbf689 (patch) | |
| tree | c0ba792ccbf5c6edb626240248dea904c21f7639 /net/netfilter/nf_conntrack_proto_generic.c | |
| parent | netfilter: nf_conntrack: fix nf_conntrack_l3proto_register (diff) | |
| download | linux-dev-f1caad274515ffd9841ac57ce9a7b5fc35bbf689.tar.xz linux-dev-f1caad274515ffd9841ac57ce9a7b5fc35bbf689.zip | |
netfilter: nf_conntrack: prepare l4proto->init_net cleanup
l4proto->init contain quite redundant code. We can simplify this
by adding a new parameter l3proto.
This patch prepares that code simplification.
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_proto_generic.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c index bb0e74fe0fae..d1ed7b44e079 100644 --- a/net/netfilter/nf_conntrack_proto_generic.c +++ b/net/netfilter/nf_conntrack_proto_generic.c @@ -135,7 +135,7 @@ static struct ctl_table generic_compat_sysctl_table[] = { #endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */ #endif /* CONFIG_SYSCTL */ -static int generic_init_net(struct net *net) +static int generic_init_net(struct net *net, u_int16_t proto) { struct nf_generic_net *gn = generic_pernet(net); struct nf_proto_net *pn = (struct nf_proto_net *)gn; |