diff options
Diffstat (limited to 'kernel/net/netfilter/nf_conntrack_core.c')
| -rw-r--r-- | kernel/net/netfilter/nf_conntrack_core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/net/netfilter/nf_conntrack_core.c b/kernel/net/netfilter/nf_conntrack_core.c index 3cb3cb831..86a3c6f0c 100644 --- 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) { + static atomic64_t unique_id; 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; - 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; |