Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / net / netfilter / nf_conntrack_netlink.c

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 2124977..ca7e835 100644 (file)
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -967,20 +967,21 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb,
                }
        }
 
-       if (nf_conntrack_event_report(IPCT_DESTROY, ct,
-                                     NETLINK_CB(skb).pid,
-                                     nlmsg_report(nlh)) < 0) {
+       if (del_timer(&ct->timeout)) {
+               if (nf_conntrack_event_report(IPCT_DESTROY, ct,
+                                             NETLINK_CB(skb).pid,
+                                             nlmsg_report(nlh)) < 0) {
+                       nf_ct_delete_from_lists(ct);
+                       /* we failed to report the event, try later */
+                       nf_ct_insert_dying_list(ct);
+                       nf_ct_put(ct);
+                       return 0;
+               }
+               /* death_by_timeout would report the event again */
+               set_bit(IPS_DYING_BIT, &ct->status);
                nf_ct_delete_from_lists(ct);
-               /* we failed to report the event, try later */
-               nf_ct_insert_dying_list(ct);
                nf_ct_put(ct);
-               return 0;
        }
-
-       /* death_by_timeout would report the event again */
-       set_bit(IPS_DYING_BIT, &ct->status);
-
-       nf_ct_kill(ct);
        nf_ct_put(ct);
 
        return 0;