hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netfilter: nf_ct_icmpv6: add icmpv6_kmemdup_sysctl_table function 

Split sysctl function into smaller chucks to cleanup code and prepare
patches to reduce ifdef pollution.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Gao feng 2012-06-21 04:36:50 +00:00 committed by Pablo Neira Ayuso
parent a9082b45ad
commit 8fc0278168
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
View File

@ -333,22 +333,31 @@ static struct ctl_table icmpv6_sysctl_table[] = {
}; };
#endif /* CONFIG_SYSCTL */ #endif /* CONFIG_SYSCTL */
static int icmpv6_init_net(struct net *net, u_int16_t proto) static int icmpv6_kmemdup_sysctl_table(struct nf_proto_net *pn,
struct nf_icmp_net *in)
{ {
struct nf_icmp_net *in = icmpv6_pernet(net);
struct nf_proto_net *pn = (struct nf_proto_net *)in;
in->timeout = nf_ct_icmpv6_timeout;
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
pn->ctl_table = kmemdup(icmpv6_sysctl_table, pn->ctl_table = kmemdup(icmpv6_sysctl_table,
sizeof(icmpv6_sysctl_table), sizeof(icmpv6_sysctl_table),
GFP_KERNEL); GFP_KERNEL);
if (!pn->ctl_table) if (!pn->ctl_table)
return -ENOMEM; return -ENOMEM;
pn->ctl_table[0].data = &in->timeout; pn->ctl_table[0].data = &in->timeout;
#endif #endif
return 0; return 0;
} }
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 = &in->pn;
in->timeout = nf_ct_icmpv6_timeout;
return icmpv6_kmemdup_sysctl_table(pn, in);
}
struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 __read_mostly = struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 __read_mostly =
{ {
.l3proto = PF_INET6, .l3proto = PF_INET6,