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/ipv6 | |
| 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/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c index 63ed0121836c..807ae09df0ca 100644 --- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c +++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c @@ -333,7 +333,7 @@ static struct ctl_table icmpv6_sysctl_table[] = { }; #endif /* CONFIG_SYSCTL */ -static int icmpv6_init_net(struct net *net) +static int icmpv6_init_net(struct net *net, u_int16_t proto) { struct nf_icmp_net *in = icmpv6_pernet(net); struct nf_proto_net *pn = (struct nf_proto_net *)in; |