lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: nf_ct_udplite: add udplite_kmemdup_sysctl_table function

Browse Source 
This cleans up nf_conntrack_l4proto_udplite[4,6] and it prepares
the moving of the sysctl code to nf_conntrack_proto_*_sysctl.c
to reduce the ifdef pollution.

And use nf_proto_net.users to identify if it's the first time
we use the nf_proto_net, in that case, we initialize it.

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:45 +00:00
committed by Pablo Neira Ayuso
parent dee7364e0e
commit 51b4c824fc
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
net/netfilter/nf_conntrack_proto_udplite.c
View File

@@ -234,29 +234,38 @@ static struct ctl_table udplite_sysctl_table[] = {
}; };
#endif /* CONFIG_SYSCTL */ #endif /* CONFIG_SYSCTL */
static int udplite_kmemdup_sysctl_table(struct nf_proto_net *pn,
struct udplite_net *un)
{
#ifdef CONFIG_SYSCTL
if (pn->ctl_table)
return 0;
pn->ctl_table = kmemdup(udplite_sysctl_table,
sizeof(udplite_sysctl_table),
GFP_KERNEL);
if (!pn->ctl_table)
return -ENOMEM;
pn->ctl_table[0].data = &un->timeouts[UDPLITE_CT_UNREPLIED];
pn->ctl_table[1].data = &un->timeouts[UDPLITE_CT_REPLIED];
#endif
return 0;
}
static int udplite_init_net(struct net *net, u_int16_t proto) static int udplite_init_net(struct net *net, u_int16_t proto)
{ {
int i;
struct udplite_net *un = udplite_pernet(net); struct udplite_net *un = udplite_pernet(net);
struct nf_proto_net *pn = (struct nf_proto_net *)un; struct nf_proto_net *pn = &un->pn;
#ifdef CONFIG_SYSCTL
if (!pn->ctl_table) { if (!pn->users) {
#else int i;
if (!pn->users++) {
#endif
for (i = 0 ; i < UDPLITE_CT_MAX; i++) for (i = 0 ; i < UDPLITE_CT_MAX; i++)
un->timeouts[i] = udplite_timeouts[i]; un->timeouts[i] = udplite_timeouts[i];
#ifdef CONFIG_SYSCTL
pn->ctl_table = kmemdup(udplite_sysctl_table,
sizeof(udplite_sysctl_table),
GFP_KERNEL);
if (!pn->ctl_table)
return -ENOMEM;
pn->ctl_table[0].data = &un->timeouts[UDPLITE_CT_UNREPLIED];
pn->ctl_table[1].data = &un->timeouts[UDPLITE_CT_REPLIED];
#endif
} }
return 0;
return udplite_kmemdup_sysctl_table(pn, un);
} }
static struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4 __read_mostly = static struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4 __read_mostly =