Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
net
/
netfilter
/
nf_conntrack_core.c
diff --git
a/kernel/net/netfilter/nf_conntrack_core.c
b/kernel/net/netfilter/nf_conntrack_core.c
index
3cb3cb8
..
86a3c6f
100644
(file)
--- a/
kernel/net/netfilter/nf_conntrack_core.c
+++ b/
kernel/net/netfilter/nf_conntrack_core.c
@@
-1757,6
+1757,7
@@
void nf_conntrack_init_end(void)
int nf_conntrack_init_net(struct net *net)
{
int nf_conntrack_init_net(struct net *net)
{
+ static atomic64_t unique_id;
int ret = -ENOMEM;
int cpu;
int ret = -ENOMEM;
int cpu;
@@
-1779,7
+1780,8
@@
int nf_conntrack_init_net(struct net *net)
if (!net->ct.stat)
goto err_pcpu_lists;
if (!net->ct.stat)
goto err_pcpu_lists;
- net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%llu",
+ (u64)atomic64_inc_return(&unique_id));
if (!net->ct.slabname)
goto err_slabname;
if (!net->ct.slabname)
goto err_slabname;