From 223dff831291f1fa274aae39f2178151957f4535 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Mon, 5 Dec 2005 13:38:16 -0800
Subject: [PATCH] --- yaml --- r: 14999 b: refs/heads/master c:
 2fdf1faa8e33082d691bcba18814276f2bd5a6f0 h: refs/heads/master i:   14997:
 e085fff2baaa06d22161a77cb5c752fb319a955d   14995:
 53ef83d972ba2d8c1472c358f7839641314f8a62   14991:
 ec9790fbd6c04e20c3335cdb9ce3432887e93b5b v: v3

---
 [refs]                                          | 2 +-
 trunk/net/ipv4/netfilter/ip_conntrack_netlink.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 606ed5c0120c..aca0bfaab03b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 266c8543480e2202ab63d1d604a5ca049f350cd8
+refs/heads/master: 2fdf1faa8e33082d691bcba18814276f2bd5a6f0
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c b/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c
index d058ac41bfd3..91fe8f2e38ff 100644
--- a/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -728,11 +728,9 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb,
 			return -ENOENT;
 		}
 	}	
-	if (del_timer(&ct->timeout)) {
-		ip_conntrack_put(ct);
+	if (del_timer(&ct->timeout))
 		ct->timeout.function((unsigned long)ct);
-		return 0;
-	}
+
 	ip_conntrack_put(ct);
 	DEBUGP("leaving\n");