diff options
-rw-r--r-- | net/ipv4/netfilter/ip_conntrack_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c index 5c3f16eae2d8..dace93eacc5c 100644 --- a/net/ipv4/netfilter/ip_conntrack_core.c +++ b/net/ipv4/netfilter/ip_conntrack_core.c | |||
@@ -316,6 +316,7 @@ destroy_conntrack(struct nf_conntrack *nfct) | |||
316 | IP_NF_ASSERT(atomic_read(&nfct->use) == 0); | 316 | IP_NF_ASSERT(atomic_read(&nfct->use) == 0); |
317 | IP_NF_ASSERT(!timer_pending(&ct->timeout)); | 317 | IP_NF_ASSERT(!timer_pending(&ct->timeout)); |
318 | 318 | ||
319 | ip_conntrack_event(IPCT_DESTROY, ct); | ||
319 | set_bit(IPS_DYING_BIT, &ct->status); | 320 | set_bit(IPS_DYING_BIT, &ct->status); |
320 | 321 | ||
321 | /* To make sure we don't get any weird locking issues here: | 322 | /* To make sure we don't get any weird locking issues here: |
@@ -355,7 +356,6 @@ static void death_by_timeout(unsigned long ul_conntrack) | |||
355 | { | 356 | { |
356 | struct ip_conntrack *ct = (void *)ul_conntrack; | 357 | struct ip_conntrack *ct = (void *)ul_conntrack; |
357 | 358 | ||
358 | ip_conntrack_event(IPCT_DESTROY, ct); | ||
359 | write_lock_bh(&ip_conntrack_lock); | 359 | write_lock_bh(&ip_conntrack_lock); |
360 | /* Inside lock so preempt is disabled on module removal path. | 360 | /* Inside lock so preempt is disabled on module removal path. |
361 | * Otherwise we can get spurious warnings. */ | 361 | * Otherwise we can get spurious warnings. */ |